[Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c

[Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2006-09-27 16:32:13

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/utils: clustat.c 

Log message:
	Apply patch from Fabio M. Di Nitto to fix clustat service name expansion bug

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&r1=1.21&r2=1.22

--- cluster/rgmanager/ChangeLog	2006/09/27 16:28:41	1.25
+++ cluster/rgmanager/ChangeLog	2006/09/27 16:32:13	1.26
@@ -23,7 +23,8 @@
 	decide if we need to wait for a node to be fenced or not.  Fix
 	node ID type.
 	* src/utils/clustat.c: Fix logic error preventing nodes from properly
-	being flagged.
+	being flagged.  Apply patch from Fabio M. Di Nitto to fix bug where
+	clustat -s foo wasn't getting expanded to service:foo
 
 2006-09-01 Lon Hohberger <lhh@redhat.com>
 	* include/resgroup.h: Add proto for rg_strerror
--- cluster/rgmanager/src/utils/clustat.c	2006/09/27 16:28:41	1.21
+++ cluster/rgmanager/src/utils/clustat.c	2006/09/27 16:32:13	1.22
@@ -683,7 +683,7 @@
 	int refresh_sec = 0, errors = 0;
 	int opt, xml = 0, flags = 0;
 	char *member_name = NULL;
-	char *rg_name = NULL;
+	char *rg_name = NULL, real_rg_name[64];
 
 	while ((opt = getopt(argc, argv, "fIls:m:i:xvQh?")) != EOF) {
 		switch(opt) {
@@ -715,6 +715,9 @@
 
 		case 's':
 			rg_name = optarg;
+			if (!strchr(rg_name,':')) {
+				snprintf(real_rg_name, , sizeof(real_rg_name), "service:%s", rg_name);
+				rg_name = real_rg_name;
 			break;
 
 		case 'x':

[Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-08-15 18:41:12

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/utils: clustat.c 

Log message:
	Fix uninitialized var

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31.2.24&r2=1.31.2.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.25.2.5&r2=1.25.2.6

--- cluster/rgmanager/ChangeLog	2007/08/02 14:46:51	1.31.2.24
+++ cluster/rgmanager/ChangeLog	2007/08/15 18:41:10	1.31.2.25
@@ -1,3 +1,7 @@
+2007-08-15 Lon Hohberger <lhh@redhat.com>
+	* src/utils/clustat.c: Remove uninitialized var & fix logic /
+	spotted by Ryan McCabe
+
 2007-08-02 Lon Hohberger <lhh@redhat.com>
 	* general: More fixes around #248727
 	* include/reslist.h, src/daemons/restree.c: Make last-value be
--- cluster/rgmanager/src/utils/clustat.c	2007/02/06 20:20:23	1.25.2.5
+++ cluster/rgmanager/src/utils/clustat.c	2007/08/15 18:41:12	1.25.2.6
@@ -835,7 +835,7 @@
 int
 main(int argc, char **argv)
 {
-	int fd, qs, ret = 0;
+	int qs, ret = 0;
 	cluster_member_list_t *membership;
 	rg_state_list_t *rgs = NULL;
 	int local_node_id;
@@ -926,25 +926,25 @@
 
 	switch(runtype) {
 	case QSTAT_ONLY:
-		if (fd < 0)
+		if (!ch)
 		       break;
 		ret = !(cman_is_quorate(ch));
 		goto cleanup;
 	case VERSION_ONLY:
 		printf("%s version %s\n", basename(argv[0]),
 		       PACKAGE_VERSION);
-		if (fd < 0)
+		if (!ch)
 		       break;
 		goto cleanup;
 	case NODEID_ONLY:
-		if (fd < 0)
+		if (!ch)
 		       break;
 		local_node_id = get_my_nodeid(ch);
 		printf("0x%08x\n",(uint32_t)(local_node_id)); 
 		goto cleanup;
 	}
 
-	if (fd < 0) {
+	if (!ch) {
 		printf("Could not connect to cluster service\n");
 		return 1;
 	}

[Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-08-15 18:43:00

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/utils: clustat.c 

Log message:
	Fix uninitialized var

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.56&r2=1.57
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&r1=1.32&r2=1.33

--- cluster/rgmanager/ChangeLog	2007/08/09 09:22:23	1.56
+++ cluster/rgmanager/ChangeLog	2007/08/15 18:43:00	1.57
@@ -1,3 +1,7 @@
+2007-08-15 Lon Hohberger <lhh@redhat.com>
+	* src/utils/clustat.c: Remove uninitialized var & fix logic /
+	spotted by Ryan McCabe
+
 2007-08-09  Fabio M. Di Nitto <fabbione@ubuntu.com>
 	* rgmanager/src/clulib/alloc.c: Undefine DEBUG when building on
 	PARISC. __builtin_address needs the same love as IA64.
--- cluster/rgmanager/src/utils/clustat.c	2007/04/27 18:10:10	1.32
+++ cluster/rgmanager/src/utils/clustat.c	2007/08/15 18:43:00	1.33
@@ -854,7 +854,7 @@
 int
 main(int argc, char **argv)
 {
-	int fd, qs, ret = 0;
+	int qs, ret = 0;
 	cluster_member_list_t *membership;
 	rg_state_list_t *rgs = NULL;
 	int local_node_id;
@@ -945,25 +945,25 @@
 
 	switch(runtype) {
 	case QSTAT_ONLY:
-		if (fd < 0)
+		if (!ch)
 		       break;
 		ret = !(cman_is_quorate(ch));
 		goto cleanup;
 	case VERSION_ONLY:
 		printf("%s version %s\n", basename(argv[0]),
 		       PACKAGE_VERSION);
-		if (fd < 0)
+		if (!ch)
 		       break;
 		goto cleanup;
 	case NODEID_ONLY:
-		if (fd < 0)
+		if (!ch)
 		       break;
 		local_node_id = get_my_nodeid(ch);
 		printf("0x%08x\n",(uint32_t)(local_node_id)); 
 		goto cleanup;
 	}
 
-	if (fd < 0) {
+	if (!ch) {
 		printf("Could not connect to cluster service\n");
 		return 1;
 	}