[Cluster-devel] [PATCH] Don't show offline + estranged members

[Cluster-devel] [PATCH] Don't show offline + estranged members

[Lon Hohberger]

This patch prevents the 'clustat' utility from showing members which:

* are not part of the configuration, and
* offline/dead/etc.

-- Lon


Index: clustat.c
===================================================================
RCS file: /cvs/cluster/cluster/rgmanager/src/utils/clustat.c,v
retrieving revision 1.38
diff -u -r1.38 clustat.c
--- clustat.c	10 Dec 2007 18:11:56 -0000 1.38
+++ clustat.c	6 Feb 2008 19:34:35 -0000
@@ -719,6 +719,10 @@
 void
 txt_member_state(cman_node_t *node, int nodesize)
 {
+	/* If it's down and not in cluster.conf, don't show it */
+	if ((node->cn_member & (FLAG_NOCFG | FLAG_UP)) == FLAG_NOCFG)
+		return;
+
 	printf(" %-*.*s ", nodesize, nodesize, node->cn_name);
 	printf("%4d ", node->cn_nodeid);
 
@@ -754,6 +758,10 @@
 void
 xml_member_state(cman_node_t *node)
 {
+	/* If it's down and not in cluster.conf, don't show it */
+	if ((node->cn_member & (FLAG_NOCFG | FLAG_UP)) == FLAG_NOCFG)
+		return;
+
 	printf("    <node name=\"%s\" state=\"%d\" local=\"%d\" "
 	       "estranged=\"%d\" rgmanager=\"%d\" rgmanager_master=\"%d\" "
 	       "qdisk=\"%d\" nodeid=\"0x%08x\"/>\n",