Attachment 479623 Details for Bug 678704 – possible fix

possible fix

no-node.patch (text/plain), 1.27 KB, created by David Teigland on 2011-02-18 22:50:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Teigland

Created: 2011-02-18 22:50:44 UTC

Size: 1.27 KB

patch

obsolete

>diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c
>index a8629b9..1dc75ff 100644
>--- a/fence/fenced/cpg.c
>+++ b/fence/fenced/cpg.c
>@@ -652,9 +652,9 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len)
> 
> 	node = get_node_victim(fd, id->nodeid);
> 	if (!node) {
>+		/* see comment below about no node */
> 		log_debug("receive_victim_done %d:%u no victim nodeid %d",
> 			  hd->nodeid, seq, id->nodeid);
>-		return;
> 	}
> 
> 	log_debug("receive_victim_done %d:%u remove victim %d time %llu how %d",
>@@ -670,7 +670,7 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len)
> 	if (hd->nodeid == our_nodeid) {
> 		/* sanity check, I don't think this should happen;
> 		   see comment in fence_victims() */
>-		if (!node->local_victim_done)
>+		if (node && !node->local_victim_done)
> 			log_error("expect local_victim_done");
> 		node->local_victim_done = 0;
> 	} else {
>@@ -680,8 +680,12 @@ static void receive_victim_done(struct fd *fd, struct fd_header *hd, int len)
> 				   id->fence_how, id->fence_time);
> 	}
> 
>-	list_del(&node->list);
>-	free(node);
>+	/* we can have no node when reduce_victims() removes it, bz 678704 */
>+
>+	if (node) {
>+		list_del(&node->list);
>+		free(node);
>+	}
> }
> 
> /* we know that the quorum value here is consistent with the cpg events

Actions: View

Attachments on bug 678704: 479623