show the disabled/permanently disabled status in the machinereadble

output for 'ctdb status'

(This used to be ctdb commit a9e920a492e1e91d205ee8b9cd704a7cf85c1e01)

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index b0771689ee0b0e681fa9cd8945fc2b4804567e1f..94c5be3b41d712267c4f2f3f9b20254b5d72f3f7 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -285,11 +285,13 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
        }
 
        if(options.machinereadable){
-               printf(":Node:IP:Status:\n");
+               printf(":Node:IP:Connected:Disabled:Permanently Disabled:\n");
                for(i=0;i<nodemap->num;i++){
-                       printf(":%d:%s:%d:\n", nodemap->nodes[i].vnn,
+                       printf(":%d:%s:%d:%d:%d:\n", nodemap->nodes[i].vnn,
                                inet_ntoa(nodemap->nodes[i].sin.sin_addr),
-                               !!nodemap->nodes[i].flags&NODE_FLAGS_CONNECTED);
+                               !!(nodemap->nodes[i].flags&NODE_FLAGS_CONNECTED),
+                               !!(nodemap->nodes[i].flags&NODE_FLAGS_DISABLED),
+                               !!(nodemap->nodes[i].flags&NODE_FLAGS_PERMANENTLY_DISABLED));
                }
                return 0;
        }