cluster: RHEL6 - rgmanager: Present all flags in clustat output

Lon Hohberger lon at fedoraproject.org
Tue Feb 1 18:10:33 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5907340776e360b327642f24f7ace0ae812b7a81
Commit:        5907340776e360b327642f24f7ace0ae812b7a81
Parent:        0e5e14cd1471464edf14776bd7ac84d14623a03d
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Wed Aug 25 14:34:59 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Feb 1 12:30:46 2011 -0500

rgmanager: Present all flags in clustat output

Resolves: rhbz#634277

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

diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index d3137e0..b64d474 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -455,6 +455,7 @@ _txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags,
 {
 	char owner[MAXHOSTNAMELEN+1];
 	char state_string[255] = "";
+	char flags_string[16] = "";
 	char *name = rs->rs_name, *ptr;
 	int l;
 
@@ -484,10 +485,14 @@ _txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags,
 	}
 
 	/* Show a frozen service */
-	if (rs->rs_flags & RG_FLAG_FROZEN) {
+	if (rs->rs_flags) {
+		rg_flags_str(flags_string, sizeof(flags_string), rs->rs_flags,
+			     NULL);
+
 		snprintf(state_string, sizeof(state_string), 
-			 "%-*.*s[Z]", statsize-3, statsize-3,
-			 rg_state_str(rs->rs_state));
+			 "%-*.*s[%s]", (int)(statsize-(2+strlen(flags_string))),
+				       (int)(statsize-(2+strlen(flags_string))),
+			 rg_state_str(rs->rs_state), flags_string);
 	} else {
 		snprintf(state_string, sizeof(state_string),
 			 "%-*.*s", statsize, statsize,


More information about the cluster-commits mailing list