[Cluster-devel] cluster/cman/cman_tool main.c

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2007-02-19 14:05:05

Modified files:
	cman/cman_tool : main.c 

Log message:
	Add -c clustername to help output.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.51&r2=1.51.2.1

--- cluster/cman/cman_tool/main.c	2006/11/03 15:07:51	1.51
+++ cluster/cman/cman_tool/main.c	2007/02/19 14:05:04	1.51.2.1
@@ -56,6 +56,7 @@
 		printf("  -e <votes>       Number of expected votes for the cluster\n");
 		printf("  -p <port>        UDP port number for cman communications\n");
 		printf("  -n <nodename>    The name of this node (defaults to hostname)\n");
+		printf("  -c <clustername> The name of the cluster to join\n");
 		printf("  -N <id>          Node id\n");
 		printf("  -w               Wait until node has joined a cluster\n");
 		printf("  -q               Wait until the cluster is quorate\n");

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2007-09-28 13:26:15

Modified files:
	cman/cman_tool : main.c 

Log message:
	Reinstate cman_tool services

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.51.2.3&r2=1.51.2.4

--- cluster/cman/cman_tool/main.c	2007/09/17 13:48:15	1.51.2.3
+++ cluster/cman/cman_tool/main.c	2007/09/28 13:26:14	1.51.2.4
@@ -787,6 +787,7 @@
 		} else if (strcmp(argv[optind], "services") == 0) {
 			if (comline->operation)
 				die("can't specify two operations");
+			comline->operation = OP_SERVICES;
 		} else if (strcmp(argv[optind], "debug") == 0) {
 			if (comline->operation)
 				die("can't specify two operations");

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-09-28 12:18:19

Modified files:
	cman/cman_tool : main.c 

Log message:
	Reinstate cman_tool services, which got lost inexplicably.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&r1=1.58&r2=1.59

--- cluster/cman/cman_tool/main.c	2007/09/28 12:00:03	1.58
+++ cluster/cman/cman_tool/main.c	2007/09/28 12:18:19	1.59
@@ -879,6 +879,7 @@
 		} else if (strcmp(argv[optind], "services") == 0) {
 			if (comline->operation)
 				die("can't specify two operations");
+			comline->operation = OP_SERVICES;
 		} else if (strcmp(argv[optind], "debug") == 0) {
 			if (comline->operation)
 				die("can't specify two operations");

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-09-28 12:00:04

Modified files:
	cman/cman_tool : main.c 

Log message:
	Call "group_tool ls" for cman_tool services

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&r1=1.57&r2=1.58

--- cluster/cman/cman_tool/main.c	2007/09/19 15:59:46	1.57
+++ cluster/cman/cman_tool/main.c	2007/09/28 12:00:03	1.58
@@ -510,7 +510,7 @@
 
 static void show_services(void)
 {
-	system("group_tool");
+	system("group_tool ls");
 }
 
 

[Cluster-devel] cluster/cman/cman_tool main.c

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rmccabe at sourceware.org	2007-08-15 19:39:56

Modified files:
	cman/cman_tool : main.c 

Log message:
	Fix a few (harmless) places where memory is allocated but not freed I stumbled onto hunting down something else.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&r1=1.52&r2=1.53

--- cluster/cman/cman_tool/main.c	2007/02/19 14:04:36	1.52
+++ cluster/cman/cman_tool/main.c	2007/08/15 19:39:54	1.53
@@ -287,7 +287,7 @@
 			printf("\n");
 		}
 	}
-
+	cman_finish(h);
 }
 
 static int node_compare(const void *va, const void *vb)
@@ -413,6 +413,8 @@
 		}
 	}
 	free(nodes);
+	free(dis_nodes);
+	cman_finish(h);
 }
 
 static void show_services(void)

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-02-19 14:04:36

Modified files:
	cman/cman_tool : main.c 

Log message:
	Add -c clustername to help output.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&r1=1.51&r2=1.52

--- cluster/cman/cman_tool/main.c	2006/11/03 15:07:51	1.51
+++ cluster/cman/cman_tool/main.c	2007/02/19 14:04:36	1.52
@@ -56,6 +56,7 @@
 		printf("  -e <votes>       Number of expected votes for the cluster\n");
 		printf("  -p <port>        UDP port number for cman communications\n");
 		printf("  -n <nodename>    The name of this node (defaults to hostname)\n");
+		printf("  -c <clustername> The name of the cluster to join\n");
 		printf("  -N <id>          Node id\n");
 		printf("  -w               Wait until node has joined a cluster\n");
 		printf("  -q               Wait until the cluster is quorate\n");

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-10-09 15:54:31

Modified files:
	cman/cman_tool : main.c 

Log message:
	If there are disallowed (AISONLY) nodes in the cluster, then name & shame them.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&r1=1.49&r2=1.50

--- cluster/cman/cman_tool/main.c	2006/10/05 07:48:33	1.49
+++ cluster/cman/cman_tool/main.c	2006/10/09 15:54:31	1.50
@@ -270,6 +270,23 @@
 	}
 	printf("\n");
 
+	if (einfo->ei_flags & CMAN_EXTRA_FLAG_DISALLOWED) {
+		int count;
+		int numnodes;
+		cman_node_t *nodes;
+
+		count = cman_get_node_count(h);
+		nodes = malloc(sizeof(cman_node_t) * count);
+
+		if (cman_get_disallowed_nodes(h, count, &numnodes, nodes) == 0) {
+			printf("Disallowed nodes: ");
+			for (i=0; i<numnodes; i++) {
+				printf("%s ", nodes[i].cn_name);
+			}
+			printf("\n");
+		}
+	}
+
 }
 
 static int node_compare(const void *va, const void *vb)

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2006-07-10 13:15:56

Modified files:
	cman/cman_tool : main.c 

Log message:
	Allow zero votes.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.12.2.8&r2=1.12.2.9

--- cluster/cman/cman_tool/main.c	2006/03/06 10:38:42	1.12.2.8
+++ cluster/cman/cman_tool/main.c	2006/07/10 13:15:56	1.12.2.9
@@ -553,7 +553,7 @@
 	if (!comline->clustername[0])
 		die("cluster name not set");
 
-	if (!comline->votes_opt)
+	if (comline->votes < 0)
 		comline->votes = DEFAULT_VOTES;
 
 	if (!comline->port)
@@ -619,6 +619,7 @@
 	prog_name = argv[0];
 
 	memset(&comline, 0, sizeof(commandline_t));
+	comline.votes = -1;
 
 	decode_arguments(argc, argv, &comline);
 

[Cluster-devel] cluster/cman/cman_tool main.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	pcaulfield at sourceware.org	2006-07-10 13:13:01

Modified files:
	cman/cman_tool : main.c 

Log message:
	Allow zero votes.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.12.2.7.6.3&r2=1.12.2.7.6.4

--- cluster/cman/cman_tool/main.c	2005/12/12 16:33:37	1.12.2.7.6.3
+++ cluster/cman/cman_tool/main.c	2006/07/10 13:13:01	1.12.2.7.6.4
@@ -557,7 +557,7 @@
 	if (!comline->clustername[0])
 		die("cluster name not set");
 
-	if (!comline->votes_opt)
+	if (comline->votes < 0)
 		comline->votes = DEFAULT_VOTES;
 
 	if (!comline->port)
@@ -623,6 +623,7 @@
 	prog_name = argv[0];
 
 	memset(&comline, 0, sizeof(commandline_t));
+	comline.votes = -1;
 
 	decode_arguments(argc, argv, &comline);