[PATCH 3/3] client: flag local node in ctdb -Y status output
David Disseldorp
ddiss at suse.de
Wed Aug 24 05:05:13 MDT 2011
Regular "ctdb status" output flags which node is the local node, do the
same for machine readable output.
---
tools/ctdb.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 42478d4..f95954c 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -502,9 +502,10 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
return ret;
}
- if(options.machinereadable){
- printf(":Node:IP:Disconnected:Banned:Disabled:Unhealthy:Stopped:Inactive:PartiallyOnline:\n");
- for(i=0;i<nodemap->num;i++){
+ if (options.machinereadable) {
+ printf(":Node:IP:Disconnected:Banned:Disabled:Unhealthy:Stopped"
+ ":Inactive:PartiallyOnline:ThisNode:\n");
+ for (i=0;i<nodemap->num;i++) {
int partially_online = 0;
int j;
@@ -528,7 +529,7 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
talloc_free(ifaces);
}
}
- printf(":%d:%s:%d:%d:%d:%d:%d:%d:%d:\n", nodemap->nodes[i].pnn,
+ printf(":%d:%s:%d:%d:%d:%d:%d:%d:%d:%d:\n", nodemap->nodes[i].pnn,
ctdb_addr_to_str(&nodemap->nodes[i].addr),
!!(nodemap->nodes[i].flags&NODE_FLAGS_DISCONNECTED),
!!(nodemap->nodes[i].flags&NODE_FLAGS_BANNED),
@@ -536,7 +537,8 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
!!(nodemap->nodes[i].flags&NODE_FLAGS_UNHEALTHY),
!!(nodemap->nodes[i].flags&NODE_FLAGS_STOPPED),
!!(nodemap->nodes[i].flags&NODE_FLAGS_INACTIVE),
- partially_online);
+ partially_online,
+ (nodemap->nodes[i].pnn == mypnn));
}
return 0;
}
--
1.7.1
More information about the samba-technical
mailing list