cluster: STABLE3 - rgmanager: Make clustat -f not query CCS/objdb

Lon Hohberger lon at fedoraproject.org
Tue Jul 6 14:35:34 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=18ad38b3e9a24e8142ed85c1d37a29423f093aae
Commit:        18ad38b3e9a24e8142ed85c1d37a29423f093aae
Parent:        f917674f6d7d75547105e036524157d32ac9929d
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Jul 6 10:33:01 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Jul 6 10:35:22 2010 -0400

rgmanager: Make clustat -f not query CCS/objdb

clustat -f queries ccs by default, which is a
fairly sizeable performance hit in some configurations.

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/utils/clustat.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index f56d3f5..077eaf5 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -937,7 +937,7 @@ xml_cluster_status(cman_cluster_t *ci, int qs,
 
 
 static cluster_member_list_t *
-build_member_list(cman_handle_t ch, int *lid)
+build_member_list(cman_handle_t ch, int *lid, int fast)
 {
 	cluster_member_list_t *all, *part;
 	cman_node_t *m;
@@ -950,7 +950,7 @@ build_member_list(cman_handle_t ch, int *lid)
 
 	part = get_member_list(ch);
 
-	if (root && (all = ccs_member_list())) {
+	if (!fast && root && (all = ccs_member_list())) {
 
 		/* See if our config has anyone missed.  If so, flag
 		   them as missing from the config file */
@@ -1140,7 +1140,7 @@ main(int argc, char **argv)
 
 	while (1) {
 		qs = cman_is_quorate(ch);
-		membership = build_member_list(ch, &local_node_id);
+		membership = build_member_list(ch, &local_node_id, fast);
 		
 		if (!member_name)
 			rgs = rg_state_list(local_node_id, fast);


More information about the cluster-commits mailing list