1 |
xmerlin 08/11/22 13:47:03 |
2 |
|
3 |
Added: |
4 |
cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch |
5 |
cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch |
6 |
cman-2.03.09-add_votes_to_transition_message.patch |
7 |
cman-2.03.09-RH_bug_457107.patch |
8 |
Removed: |
9 |
cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch |
10 |
cman-2.02.39-RH_bug_457107.patch |
11 |
Log: |
12 |
Renamed patches, added some fixes in r1. |
13 |
(Portage version: 2.1.4.4) |
14 |
|
15 |
Revision Changes Path |
16 |
1.1 sys-cluster/cman/files/cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch |
17 |
|
18 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch |
22 |
=================================================================== |
23 |
From: Lon Hohberger <lhh@××××××.com> |
24 |
Date: Fri, 7 Nov 2008 17:53:51 +0000 (-0500) |
25 |
Subject: qdisk: fix block size check |
26 |
X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=c90643c8824ff2f12e2debc05f32f981facfcbd3 |
27 |
|
28 |
qdisk: fix block size check |
29 |
|
30 |
When using device="" instead of label="", this check was causing |
31 |
qdiskd to incorrectly exit. |
32 |
|
33 |
Resolves: #470533 |
34 |
--- |
35 |
|
36 |
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c |
37 |
index 0e27cb7..e26e1fc 100644 |
38 |
--- a/cman/qdisk/main.c |
39 |
+++ b/cman/qdisk/main.c |
40 |
@@ -1491,12 +1491,12 @@ main(int argc, char **argv) |
41 |
} |
42 |
|
43 |
if (qh.qh_version == VERSION_MAGIC_V2 && |
44 |
- qh.qh_blksz != rv) { |
45 |
+ qh.qh_blksz != qh.qh_kernsz) { |
46 |
clulog(LOG_CRIT, |
47 |
- "Specified device %s does match kernel's " |
48 |
+ "Specified device %s does not match kernel's " |
49 |
"reported sector size (%d != %d)\n", |
50 |
ctx.qc_device, |
51 |
- ctx.qc_disk.d_blksz, rv); |
52 |
+ qh.qh_blksz, qh.qh_kernsz); |
53 |
check_stop_cman(&ctx); |
54 |
goto out; |
55 |
} |
56 |
|
57 |
|
58 |
|
59 |
1.1 sys-cluster/cman/files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch |
60 |
|
61 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch?rev=1.1&view=markup |
62 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch?rev=1.1&content-type=text/plain |
63 |
|
64 |
Index: cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch |
65 |
=================================================================== |
66 |
From: Christine Caulfield <ccaulfie@××××××.com> |
67 |
Date: Wed, 19 Nov 2008 11:16:30 +0000 (+0000) |
68 |
Subject: cman: fix signatures of cman_get_privdata & cman_set_privdata |
69 |
X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=6f11a5cb225a9547a18440e9129410c32aa2be3f |
70 |
|
71 |
cman: fix signatures of cman_get_privdata & cman_set_privdata |
72 |
|
73 |
They do NOT take a pointer to a handle. |
74 |
|
75 |
Signed-off-by: Christine Caulfield <ccaulfie@××××××.com> |
76 |
--- |
77 |
|
78 |
diff --git a/cman/lib/libcman.c b/cman/lib/libcman.c |
79 |
index cee0147..9465412 100644 |
80 |
--- a/cman/lib/libcman.c |
81 |
+++ b/cman/lib/libcman.c |
82 |
@@ -346,7 +346,7 @@ int cman_finish(cman_handle_t handle) |
83 |
return 0; |
84 |
} |
85 |
|
86 |
-int cman_setprivdata(cman_handle_t *handle, void *privdata) |
87 |
+int cman_setprivdata(cman_handle_t handle, void *privdata) |
88 |
{ |
89 |
struct cman_handle *h = (struct cman_handle *)handle; |
90 |
VALIDATE_HANDLE(h); |
91 |
@@ -355,7 +355,7 @@ int cman_setprivdata(cman_handle_t *handle, void *privdata) |
92 |
return 0; |
93 |
} |
94 |
|
95 |
-int cman_getprivdata(cman_handle_t *handle, void **privdata) |
96 |
+int cman_getprivdata(cman_handle_t handle, void **privdata) |
97 |
{ |
98 |
struct cman_handle *h = (struct cman_handle *)handle; |
99 |
VALIDATE_HANDLE(h); |
100 |
diff --git a/cman/lib/libcman.h b/cman/lib/libcman.h |
101 |
index 3771176..b4fb4e4 100644 |
102 |
--- a/cman/lib/libcman.h |
103 |
+++ b/cman/lib/libcman.h |
104 |
@@ -196,8 +196,8 @@ cman_handle_t cman_admin_init(void *privdata); |
105 |
int cman_finish(cman_handle_t handle); |
106 |
|
107 |
/* Update/retrieve the private data */ |
108 |
-int cman_setprivdata(cman_handle_t *h, void *privdata); |
109 |
-int cman_getprivdata(cman_handle_t *h, void **privdata); |
110 |
+int cman_setprivdata(cman_handle_t h, void *privdata); |
111 |
+int cman_getprivdata(cman_handle_t h, void **privdata); |
112 |
|
113 |
/* |
114 |
* Notification of membership change events. Note that these are sent after |
115 |
|
116 |
|
117 |
|
118 |
1.1 sys-cluster/cman/files/cman-2.03.09-add_votes_to_transition_message.patch |
119 |
|
120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-add_votes_to_transition_message.patch?rev=1.1&view=markup |
121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-add_votes_to_transition_message.patch?rev=1.1&content-type=text/plain |
122 |
|
123 |
Index: cman-2.03.09-add_votes_to_transition_message.patch |
124 |
=================================================================== |
125 |
From: Christine Caulfield <ccaulfie@××××××.com> |
126 |
Date: Thu, 6 Nov 2008 11:53:14 +0000 (+0000) |
127 |
Subject: cman: add votes to transition message |
128 |
X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=2a983d103349d8aa1da2a7332bec334b849b0e3e |
129 |
|
130 |
cman: add votes to transition message |
131 |
|
132 |
This uses a previously unused field in this message to help provide |
133 |
forward-compatibility with cluster3 systems which need the node votes |
134 |
to be provided by the node itself, rather than the global configuration |
135 |
system. |
136 |
|
137 |
Signed-off-by: Christine Caulfield <ccaulfie@××××××.com> |
138 |
--- |
139 |
|
140 |
diff --git a/cman/daemon/cnxman-private.h b/cman/daemon/cnxman-private.h |
141 |
index 0e433a6..27a3c2e 100644 |
142 |
--- a/cman/daemon/cnxman-private.h |
143 |
+++ b/cman/daemon/cnxman-private.h |
144 |
@@ -59,7 +59,7 @@ struct cl_transmsg { |
145 |
unsigned char cmd; |
146 |
unsigned char first_trans; |
147 |
uint16_t cluster_id; |
148 |
- int high_nodeid; |
149 |
+ int votes; |
150 |
int expected_votes; |
151 |
|
152 |
unsigned int major_version; /* Not backwards compatible */ |
153 |
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c |
154 |
index 519a10d..00cdb65 100644 |
155 |
--- a/cman/daemon/commands.c |
156 |
+++ b/cman/daemon/commands.c |
157 |
@@ -1538,7 +1538,7 @@ void send_transition_msg(int last_memb_count, int first_trans) |
158 |
P_MEMB("sending TRANSITION message. cluster_name = %s\n", cluster_name); |
159 |
msg->cmd = CLUSTER_MSG_TRANSITION; |
160 |
msg->first_trans = first_trans; |
161 |
- msg->high_nodeid = get_highest_nodeid(); |
162 |
+ msg->votes = us->votes; |
163 |
msg->expected_votes = us->expected_votes; |
164 |
msg->cluster_id = cluster_id; |
165 |
msg->major_version = CNXMAN_MAJOR_VERSION; |
166 |
@@ -1588,7 +1588,7 @@ static void byteswap_internal_message(char *data, int len) |
167 |
case CLUSTER_MSG_TRANSITION: |
168 |
transmsg = (struct cl_transmsg *)data; |
169 |
transmsg->cluster_id = swab16(transmsg->cluster_id); |
170 |
- transmsg->high_nodeid = swab32(transmsg->high_nodeid); |
171 |
+ transmsg->votes = swab32(transmsg->votes); |
172 |
transmsg->expected_votes = swab32(transmsg->expected_votes); |
173 |
transmsg->major_version = swab32(transmsg->major_version); |
174 |
transmsg->minor_version = swab32(transmsg->minor_version); |
175 |
diff --git a/cman/daemon/cnxman-private.h b/cman/daemon/cnxman-private.h |
176 |
index 27a3c2e..345242d 100644 |
177 |
--- a/cman/daemon/cnxman-private.h |
178 |
+++ b/cman/daemon/cnxman-private.h |
179 |
@@ -5,7 +5,7 @@ |
180 |
|
181 |
/* Protocol Version triplet */ |
182 |
#define CNXMAN_MAJOR_VERSION 6 |
183 |
-#define CNXMAN_MINOR_VERSION 1 |
184 |
+#define CNXMAN_MINOR_VERSION 2 |
185 |
#define CNXMAN_PATCH_VERSION 0 |
186 |
|
187 |
/* How we announce ourself in console events */ |
188 |
|
189 |
|
190 |
|
191 |
1.1 sys-cluster/cman/files/cman-2.03.09-RH_bug_457107.patch |
192 |
|
193 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-RH_bug_457107.patch?rev=1.1&view=markup |
194 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/files/cman-2.03.09-RH_bug_457107.patch?rev=1.1&content-type=text/plain |
195 |
|
196 |
Index: cman-2.03.09-RH_bug_457107.patch |
197 |
=================================================================== |
198 |
--- cluster-2.03.09/cman/daemon/commands.c.orig 2008-11-18 14:59:52.000000000 +0100 |
199 |
+++ cluster-2.03.09/cman/daemon/commands.c 2008-11-18 15:00:27.000000000 +0100 |
200 |
@@ -1729,8 +1729,7 @@ |
201 |
|
202 |
/* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down |
203 |
and has state then we mark it disallowed because we cannot merge stateful nodes */ |
204 |
- if ( (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) || |
205 |
- (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) { |
206 |
+ if ( msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) { |
207 |
/* Don't duplicate messages */ |
208 |
if (node->state != NODESTATE_AISONLY) { |
209 |
if (cluster_is_quorate) { |