LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c

LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c

[ccaulfield]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	ccaulfield@sourceware.org	2009-06-03 13:42:02

Modified files:
	.              : WHATS_NEW 
	daemons/clvmd  : clvmd-corosync.c 

Log message:
	Fix clvmd-corosync to match the new corosync API.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1139&r2=1.1140
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10

--- LVM2/WHATS_NEW	2009/06/03 11:49:05	1.1139
+++ LVM2/WHATS_NEW	2009/06/03 13:42:02	1.1140
@@ -1,5 +1,6 @@
 Version 2.02.48 - 
 ===============================
+  Fix clvmd-corosync to match new corosync API.
   Fix makefile to build also shared libraries when running plain make.
   Fix rename of active snapshot with virtual origin.
   Fix convert polling to ignore LV with different UUID.
--- LVM2/daemons/clvmd/clvmd-corosync.c	2009/04/21 13:11:28	1.9
+++ LVM2/daemons/clvmd/clvmd-corosync.c	2009/06/03 13:42:02	1.10
@@ -56,16 +56,16 @@
 #define LOCKSPACE_NAME "clvmd"
 
 static void cpg_deliver_callback (cpg_handle_t handle,
-				  struct cpg_name *groupName,
+				  const struct cpg_name *groupName,
 				  uint32_t nodeid,
 				  uint32_t pid,
 				  void *msg,
-				  int msg_len);
+				  size_t msg_len);
 static void cpg_confchg_callback(cpg_handle_t handle,
-				 struct cpg_name *groupName,
-				 struct cpg_address *member_list, int member_list_entries,
-				 struct cpg_address *left_list, int left_list_entries,
-				 struct cpg_address *joined_list, int joined_list_entries);
+				 const struct cpg_name *groupName,
+				 const struct cpg_address *member_list, size_t member_list_entries,
+				 const struct cpg_address *left_list, size_t left_list_entries,
+				 const struct cpg_address *joined_list, size_t joined_list_entries);
 static void _cluster_closedown(void);
 
 /* Hash list of nodes in the cluster */
@@ -206,17 +206,17 @@
 }
 
 static void cpg_deliver_callback (cpg_handle_t handle,
-				  struct cpg_name *groupName,
+				  const struct cpg_name *groupName,
 				  uint32_t nodeid,
 				  uint32_t pid,
 				  void *msg,
-				  int msg_len)
+				  size_t msg_len)
 {
 	int target_nodeid;
 
 	memcpy(&target_nodeid, msg, COROSYNC_CSID_LEN);
 
-	DEBUGLOG("%u got message from nodeid %d for %d. len %d\n",
+	DEBUGLOG("%u got message from nodeid %d for %d. len %zd\n",
 		 our_nodeid, nodeid, target_nodeid, msg_len-4);
 
 	if (nodeid != our_nodeid)
@@ -226,15 +226,15 @@
 }
 
 static void cpg_confchg_callback(cpg_handle_t handle,
-				 struct cpg_name *groupName,
-				 struct cpg_address *member_list, int member_list_entries,
-				 struct cpg_address *left_list, int left_list_entries,
-				 struct cpg_address *joined_list, int joined_list_entries)
+				 const struct cpg_name *groupName,
+				 const struct cpg_address *member_list, size_t member_list_entries,
+				 const struct cpg_address *left_list, size_t left_list_entries,
+				 const struct cpg_address *joined_list, size_t joined_list_entries)
 {
 	int i;
 	struct node_info *ninfo;
 
-	DEBUGLOG("confchg callback. %d joined, %d left, %d members\n",
+	DEBUGLOG("confchg callback. %zd joined, %zd left, %zd members\n",
 		 joined_list_entries, left_list_entries, member_list_entries);
 
 	for (i=0; i<joined_list_entries; i++) {
@@ -580,7 +580,7 @@
 {
 	confdb_handle_t handle;
 	int result;
-	int namelen = buflen;
+	size_t namelen = buflen;
 	hdb_handle_t cluster_handle;
 	confdb_callbacks_t callbacks = {
 		.confdb_key_change_notify_fn = NULL,

LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c

[ccaulfield]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	ccaulfield@sourceware.org	2009-04-01 07:51:06

Modified files:
	.              : WHATS_NEW 
	daemons/clvmd  : clvmd-corosync.c 

Log message:
	Make sure clvmd-corosync releases the lockspace when it exits.
	
	patch from Xinwei Hu

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1073&r2=1.1074
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.7&r2=1.8

--- LVM2/WHATS_NEW	2009/03/24 13:16:34	1.1073
+++ LVM2/WHATS_NEW	2009/04/01 07:51:05	1.1074
@@ -1,5 +1,6 @@
 Version 2.02.46 - 
 ================================
+  Make sure clvmd-corosync releases the lockspace when it exits.
   Fix segfault for vgcfgrestore on VG with missing PVs.
   Block SIGTERM & SIGINT in clvmd subthreads.
   Detect and conditionally wipe swapspace signatures in pvcreate.
--- LVM2/daemons/clvmd/clvmd-corosync.c	2009/03/06 11:29:38	1.7
+++ LVM2/daemons/clvmd/clvmd-corosync.c	2009/04/01 07:51:06	1.8
@@ -334,7 +334,7 @@
 	if (err != CS_OK) {
 		cpg_finalize(cpg_handle);
 		quorum_finalize(quorum_handle);
-		dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0);
+		dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 		syslog(LOG_ERR, "Cannot join clvmd process group");
 		DEBUGLOG("Cannot join clvmd process group: %d\n", err);
 		return cs_to_errno(err);
@@ -345,7 +345,7 @@
 	if (err != CS_OK) {
 		cpg_finalize(cpg_handle);
 		quorum_finalize(quorum_handle);
-		dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0);
+		dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 		syslog(LOG_ERR, "Cannot get local node id\n");
 		return cs_to_errno(err);
 	}
@@ -361,7 +361,7 @@
 	DEBUGLOG("cluster_closedown\n");
 	unlock_all();
 
-	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0);
+	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 	cpg_finalize(cpg_handle);
 	quorum_finalize(quorum_handle);
 }

LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c

[ccaulfield]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	ccaulfield@sourceware.org	2009-03-06 11:29:38

Modified files:
	.              : WHATS_NEW 
	daemons/clvmd  : clvmd-corosync.c 

Log message:
	Fix unlocks in clvmd-corosync.
	
	The DLM unlock returns EUNLOCK in the lksb on success, not 0

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1062&r2=1.1063
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.6&r2=1.7

--- LVM2/WHATS_NEW	2009/03/05 16:25:35	1.1062
+++ LVM2/WHATS_NEW	2009/03/06 11:29:38	1.1063
@@ -1,6 +1,7 @@
 Version 2.02.46 - 
 ================================
   Flush memory pool and fix locking in clvmd refresh and backup command.
+  Fix unlocks in clvmd-corosync. Broken in 2.02.45.
 
 Version 2.02.45 - 3rd March 2009
 ================================
--- LVM2/daemons/clvmd/clvmd-corosync.c	2009/02/25 14:33:01	1.6
+++ LVM2/daemons/clvmd/clvmd-corosync.c	2009/03/06 11:29:38	1.7
@@ -510,7 +510,7 @@
 		DEBUGLOG("Unlock returned %d\n", err);
 		return err;
 	}
-	if (lksb.sb_status != 0)
+	if (lksb.sb_status != EUNLOCK)
 	{
 		DEBUGLOG("dlm_ls_unlock_wait returns lksb.sb_status: %d\n", lksb.sb_status);
 		errno = lksb.sb_status;

LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c

[ccaulfield]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	ccaulfield@sourceware.org	2009-02-25 14:33:01

Modified files:
	.              : WHATS_NEW 
	daemons/clvmd  : clvmd-corosync.c 

Log message:
	Fix error returns in clvmd-corosync interface to DLM.
	
	Thanks to Xinwei Hu for spotting this.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1053&r2=1.1054
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.5&r2=1.6

--- LVM2/WHATS_NEW	2009/02/25 13:17:40	1.1053
+++ LVM2/WHATS_NEW	2009/02/25 14:33:00	1.1054
@@ -1,5 +1,6 @@
 Version 2.02.45 - 
 ===================================
+  Fix error returns in clvmd-corosync interface to DLM.
   Add --refresh to vgchange and vgmknodes man pages.
   Fixed bug where lvresize option -t was not properly passed to fsadm.
   Using argv[] list in exec_cmd() to allow more params for external commands.
--- LVM2/daemons/clvmd/clvmd-corosync.c	2009/02/11 10:13:20	1.5
+++ LVM2/daemons/clvmd/clvmd-corosync.c	2009/02/25 14:33:01	1.6
@@ -478,6 +478,12 @@
 		DEBUGLOG("dlm_ls_lock returned %d\n", errno);
 		return err;
 	}
+	if (lksb.sb_status != 0)
+	{
+		DEBUGLOG("dlm_ls_lock returns lksb.sb_status %d\n", lksb.sb_status);
+		errno = lksb.sb_status;
+		return -1;
+	}
 
 	DEBUGLOG("lock_resource returning %d, lock_id=%x\n", err, lksb.sb_lkid);
 
@@ -504,6 +510,13 @@
 		DEBUGLOG("Unlock returned %d\n", err);
 		return err;
 	}
+	if (lksb.sb_status != 0)
+	{
+		DEBUGLOG("dlm_ls_unlock_wait returns lksb.sb_status: %d\n", lksb.sb_status);
+		errno = lksb.sb_status;
+		return -1;
+	}   
+
 
 	return 0;
 }
@@ -568,7 +581,7 @@
 	confdb_handle_t handle;
 	int result;
 	int namelen = buflen;
-	unsigned int cluster_handle;
+	hdb_handle_t cluster_handle;
 	confdb_callbacks_t callbacks = {
 		.confdb_key_change_notify_fn = NULL,
 		.confdb_object_create_change_notify_fn = NULL,

LVM2 ./WHATS_NEW daemons/clvmd/clvmd-corosync.c

[ccaulfield]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	ccaulfield@sourceware.org	2009-02-10 13:22:19

Modified files:
	.              : WHATS_NEW 
	daemons/clvmd  : clvmd-corosync.c 

Log message:
	Remove duplicate cpg_initialize from clvmd startup.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1040&r2=1.1041
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4

--- LVM2/WHATS_NEW	2009/02/10 11:53:33	1.1040
+++ LVM2/WHATS_NEW	2009/02/10 13:22:18	1.1041
@@ -1,5 +1,6 @@
 Version 2.02.45 - 
 ===================================
+  Remove duplicate cpg_initialize from clvmd startup.
   Add option to /etc/sysconfig/cluster to select cluster type for clvmd.
   Allow clvmd to start up if its lockspace already exists.
   Separate PV label attributes which do not need parse metadata when reporting.
--- LVM2/daemons/clvmd/clvmd-corosync.c	2009/02/10 11:52:40	1.3
+++ LVM2/daemons/clvmd/clvmd-corosync.c	2009/02/10 13:22:18	1.4
@@ -326,11 +326,6 @@
 	dlm_ls_pthread_init(lockspace);
 	DEBUGLOG("DLM initialisation complete\n");
 
-	err = cpg_initialize(&cpg_handle, &cpg_callbacks);
-	if (err != CS_OK) {
-		return cs_to_errno(err);
-	}
-
 	/* Connect to the clvmd group */
 	strcpy((char *)cpg_group_name.value, "clvmd");
 	cpg_group_name.length = strlen((char *)cpg_group_name.value);