diff options
| author | David Disseldorp <ddiss@suse.de> | 2011-08-24 11:34:56 +0200 |
|---|---|---|
| committer | David Disseldorp <ddiss@suse.de> | 2011-09-06 13:57:04 +0200 |
| commit | 941ba90126d8cbac78cc52a67fb8c87f5a5a06ae (patch) | |
| tree | 2c2197cbfde77fc9fe22dcb7d7bd6b568f125b0b | |
| parent | 5296da5609fcab1f24ea4d5578988acd831c5248 (diff) | |
| download | samba-941ba90126d8cbac78cc52a67fb8c87f5a5a06ae.tar.gz samba-941ba90126d8cbac78cc52a67fb8c87f5a5a06ae.tar.xz samba-941ba90126d8cbac78cc52a67fb8c87f5a5a06ae.zip | |
client: flag local node in ctdb -Y status output
Regular "ctdb status" output flags which node is the local node, do the
same for machine readable output.
(This used to be ctdb commit 3885141f37724b3dea61b45fbac38489ec356588)
| -rw-r--r-- | ctdb/tools/ctdb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index e30302b218..a8474cf9b8 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -624,9 +624,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; @@ -650,7 +651,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), @@ -658,7 +659,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; } |