public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: master - cman: Fix showing dead nodes in a config-less cluster
@ 2009-02-04 14:43 Christine Caulfield
0 siblings, 0 replies; only message in thread
From: Christine Caulfield @ 2009-02-04 14:43 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c4a768addd3891029c141a2ccdc9a2032c855412
Commit: c4a768addd3891029c141a2ccdc9a2032c855412
Parent: 6f5b61f3e93595788cffe162994212572d348ca5
Author: Christine Caulfield <ccaulfie@redhat.com>
AuthorDate: Wed Feb 4 14:42:42 2009 +0000
Committer: Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Wed Feb 4 14:42:42 2009 +0000
cman: Fix showing dead nodes in a config-less cluster
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
cman/services/cman/lib/libcman.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cman/services/cman/lib/libcman.c b/cman/services/cman/lib/libcman.c
index 09ca151..148881f 100644
--- a/cman/services/cman/lib/libcman.c
+++ b/cman/services/cman/lib/libcman.c
@@ -1053,7 +1053,7 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_
int ccs_handle;
char *value;
int ret;
- int i;
+ int i,j;
int num_nodes = 0;
char path[PATH_MAX];
int noconfig_flag=0;
@@ -1086,7 +1086,6 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_
for (i=0; i < cman_inst->node_count; i++) {
nodes[i].cn_nodeid = cman_inst->node_list[i].nodeid;
- nodes[i].cn_member = 1;
name = NULL;
error = corosync_cfg_get_node_addrs(cman_inst->cfg_handle, nodes[i].cn_nodeid, max_addrs, &num_addrs, addrs);
@@ -1099,6 +1098,14 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_
else {
sprintf(nodes[i].cn_name, "Node-%x", nodes[i].cn_nodeid);
}
+
+ /* Reconcile with active nodes list. */
+ for (j=0; j < cman_inst->node_count; j++) {
+ if (cman_inst->node_list[j].nodeid == nodes[i].cn_nodeid) {
+ nodes[i].cn_member = (cman_inst->node_list[j].state == NODESTATE_MEMBER);
+ }
+ }
+
}
}
else {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-04 14:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-04 14:43 cluster: master - cman: Fix showing dead nodes in a config-less cluster Christine Caulfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).