cluster: RHEL56 - rgmanager: Present all flags in clustat output
Lon Hohberger
lon at fedoraproject.org
Fri Sep 24 22:20:52 UTC 2010
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d826bd7fd129f80601a2b33cadc8f1d32f4f8e69
Commit: d826bd7fd129f80601a2b33cadc8f1d32f4f8e69
Parent: d8572889efb66c3540658c3eb9974b8e870d56ed
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Wed Aug 25 14:34:59 2010 -0400
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Sep 24 16:16:02 2010 -0400
rgmanager: Present all flags in clustat output
Resolves: rhbz#605733
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 2f58d5a..567fe2c 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;
@@ -485,10 +486,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