[Cluster-devel] cluster/cmirror/src cluster.c

[jbrassow at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	jbrassow at sourceware.org	2007-11-19 18:00:20

Modified files:
	cmirror/src    : cluster.c 

Log message:
	- remove stray 'goto' statement.  Fixes issue where server refuses to
	accept responsibility during some activation scenarios.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/cluster.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.6&r2=1.1.2.7

--- cluster/cmirror/src/Attic/cluster.c	2007/11/09 05:47:05	1.1.2.6
+++ cluster/cmirror/src/Attic/cluster.c	2007/11/19 18:00:20	1.1.2.7
@@ -21,7 +21,6 @@
 
 #define DM_CLOG_RESPONSE 0x1000 /* in last byte of 32-bit value */
 #define DM_CLOG_CHECKPOINT_READY ((uint32_t)-1)
-#define DM_CLOG_CHECKPOINT_REQUEST 0
 
 static uint32_t my_cluster_id = 0xDEAD;
 static SaCkptHandleT ckpt_handle;
@@ -162,6 +161,11 @@
 		/*
 		 * Errors from previous functions are in the tfr struct.
 		 */
+
+		LOG_DBG("Sending respose to %u on cluster: [%s/%llu]",
+			tfr->originator,
+			RQ_TYPE(tfr->request_type & ~DM_CLOG_RESPONSE),
+			tfr->seq);
 		r = cluster_send(tfr);
 		if (r)
 			LOG_ERROR("cluster_send failed");
@@ -768,9 +772,9 @@
 	if (!left_list_entries &&
 	    (member_list_entries == 1) && (joined_list_entries == 1) &&
 	    (member_list[0].nodeid == joined_list[0].nodeid)) {
-		match->lowest_id = my_cluster_id = joined_list[0].nodeid;
 		LOG_DBG("I am the log server (and first to join) for %s",
 			match->name.value);
+		match->lowest_id = my_cluster_id = joined_list[0].nodeid;
 		match->valid = 1;
 		goto out;
 	}
@@ -789,7 +793,6 @@
 				LOG_PRINT("Setting my cluster id: %u", my_cluster_id);
 			}
 		}
-		goto out;
 	}
 
 	/* Find the lowest_id, i.e. the server */