Attachment 153280 Details for Bug 237386 – Proposed patch to fix

[patch] Proposed patch to fix

clvmd-qdisk.patch (text/plain), 1.31 KB, created by Christine Caulfield on 2007-04-23 13:33:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-04-23 13:33:39 UTC

Size: 1.31 KB

patch

obsolete

>? a.out
>? clname.patch
>? clvmd
>? lvmtest.c
>? run_clvmd
>? run_clvmd.c
>Index: clvmd-cman.c
>===================================================================
>RCS file: /cvs/lvm2/LVM2/daemons/clvmd/clvmd-cman.c,v
>retrieving revision 1.16
>diff -u -p -r1.16 clvmd-cman.c
>--- clvmd-cman.c	9 Oct 2006 14:11:57 -0000	1.16
>+++ clvmd-cman.c	23 Apr 2007 13:33:07 -0000
>@@ -121,7 +121,7 @@ static int _get_num_nodes()
> 
> 	/* return number of ACTIVE nodes */
> 	for (i=0; i<num_nodes; i++) {
>-		if (nodes[i].cn_member)
>+		if (nodes[i].cn_member && nodes[i].cn_nodeid)
> 			nnodes++;
> 	}
> 	return nnodes;
>@@ -159,7 +159,7 @@ static int _cluster_do_node_callback(str
> 	int somedown = 0;
> 
> 	for (i = 0; i < _get_num_nodes(); i++) {
>-		if (nodes[i].cn_member) {
>+		if (nodes[i].cn_member && nodes[i].cn_nodeid) {
> 			callback(client, (char *)&nodes[i].cn_nodeid, node_updown[nodes[i].cn_nodeid]);
> 			if (!node_updown[nodes[i].cn_nodeid])
> 				somedown = -1;
>@@ -168,8 +168,7 @@ static int _cluster_do_node_callback(str
> 	return somedown;
> }
> 
>-/* Process OOB message from the cluster socket,
>-   this currently just means that a node has stopped listening on our port */
>+/* Process OOB messages from the cluster socket */
> static void event_callback(cman_handle_t handle, void *private, int reason, int arg)
> {
> 	char namebuf[MAX_CLUSTER_MEMBER_NAME_LEN];

Actions: View | Diff

Attachments on bug 237386: 153280