cli,glusterd: more volume status improvements

The major changes are,
* "volume status" now supports getting details of the self-heal daemon processes
for replica volumes. A new cli options "shd", similar to "nfs", has been
introduced for this. "detail", "fd" and "clients" status ops are not supported
for self-heal daemons.
* The default/normal ouput of "volume status" has been enhanced to contain
information about nfs-server and self-heal daemon processes as well. Some tweaks
have been done to the cli output to show appropriate output.

Also, changes have been done to rebalance/remove-brick status, so that hostnames
are displayed instead of uuids.

Change-Id: I3972396dcf72d45e14837fa5f9c7d62410901df8
BUG: 803676
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3016
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kp@gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>

3 files changed, 28 insertions, 26 deletions

diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index 0191c50aa62..cccd1e7f898 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -186,8 +186,8 @@ enum glusterd_brick_procnum {
         GLUSTERD_BRICK_STATUS,
         GLUSTERD_BRICK_OP,
         GLUSTERD_BRICK_XLATOR_DEFRAG,
-        GLUSTERD_NFS_PROFILE,
-        GLUSTERD_NFS_STATUS,
+        GLUSTERD_NODE_PROFILE,
+        GLUSTERD_NODE_STATUS,
         GLUSTERD_BRICK_MAXVALUE,
 };
 
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index 979c2250f35..6b6458b70d0 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -155,18 +155,19 @@ enum gf1_cli_top_op {
 typedef enum gf1_cli_top_op gf1_cli_top_op;
 
 enum gf_cli_status_type {
-	GF_CLI_STATUS_NONE = 0x000,
-	GF_CLI_STATUS_MEM = 0x001,
-	GF_CLI_STATUS_CLIENTS = 0x002,
-	GF_CLI_STATUS_INODE = 0x004,
-	GF_CLI_STATUS_FD = 0x008,
-	GF_CLI_STATUS_CALLPOOL = 0x010,
-	GF_CLI_STATUS_DETAIL = 0x020,
-	GF_CLI_STATUS_MASK = 0x0FF,
-	GF_CLI_STATUS_VOL = 0x100,
-	GF_CLI_STATUS_ALL = 0x200,
-	GF_CLI_STATUS_BRICK = 0x400,
-	GF_CLI_STATUS_NFS = 0x800,
+	GF_CLI_STATUS_NONE = 0x0000,
+	GF_CLI_STATUS_MEM = 0x0001,
+	GF_CLI_STATUS_CLIENTS = 0x0002,
+	GF_CLI_STATUS_INODE = 0x0004,
+	GF_CLI_STATUS_FD = 0x0008,
+	GF_CLI_STATUS_CALLPOOL = 0x0010,
+	GF_CLI_STATUS_DETAIL = 0x0020,
+	GF_CLI_STATUS_MASK = 0x00FF,
+	GF_CLI_STATUS_VOL = 0x0100,
+	GF_CLI_STATUS_ALL = 0x0200,
+	GF_CLI_STATUS_BRICK = 0x0400,
+	GF_CLI_STATUS_NFS = 0x0800,
+	GF_CLI_STATUS_SHD = 0x1000,
 };
 typedef enum gf_cli_status_type gf_cli_status_type;
 
diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x
index 72d2dbef448..d90aa2039f5 100644
--- a/rpc/xdr/src/cli1-xdr.x
+++ b/rpc/xdr/src/cli1-xdr.x
@@ -100,18 +100,19 @@ enum gf1_cli_top_op {
 /* The unconventional hex numbers help us perform
    bit-wise operations which reduces complexity */
 enum gf_cli_status_type {
-        GF_CLI_STATUS_NONE         = 0x000,
-        GF_CLI_STATUS_MEM          = 0x001,     /*000000000001*/
-        GF_CLI_STATUS_CLIENTS      = 0x002,     /*000000000010*/
-        GF_CLI_STATUS_INODE        = 0x004,     /*000000000100*/
-        GF_CLI_STATUS_FD           = 0x008,     /*000000001000*/
-        GF_CLI_STATUS_CALLPOOL     = 0x010,     /*000000010000*/
-        GF_CLI_STATUS_DETAIL       = 0x020,     /*000000100000*/
-        GF_CLI_STATUS_MASK         = 0x0FF,     /*000011111111 Used to get the op*/
-        GF_CLI_STATUS_VOL          = 0x100,     /*000100000000*/
-        GF_CLI_STATUS_ALL          = 0x200,     /*001000000000*/
-        GF_CLI_STATUS_BRICK        = 0x400,     /*010000000000*/
-        GF_CLI_STATUS_NFS          = 0x800      /*100000000000*/
+        GF_CLI_STATUS_NONE         = 0x0000,
+        GF_CLI_STATUS_MEM          = 0x0001,    /*0000000000001*/
+        GF_CLI_STATUS_CLIENTS      = 0x0002,    /*0000000000010*/
+        GF_CLI_STATUS_INODE        = 0x0004,    /*0000000000100*/
+        GF_CLI_STATUS_FD           = 0x0008,    /*0000000001000*/
+        GF_CLI_STATUS_CALLPOOL     = 0x0010,    /*0000000010000*/
+        GF_CLI_STATUS_DETAIL       = 0x0020,    /*0000000100000*/
+        GF_CLI_STATUS_MASK         = 0x00FF,    /*0000011111111 Used to get the op*/
+        GF_CLI_STATUS_VOL          = 0x0100,    /*0000100000000*/
+        GF_CLI_STATUS_ALL          = 0x0200,    /*0001000000000*/
+        GF_CLI_STATUS_BRICK        = 0x0400,    /*0010000000000*/
+        GF_CLI_STATUS_NFS          = 0x0800,    /*0100000000000*/
+        GF_CLI_STATUS_SHD          = 0x1000     /*1000000000000*/
 };
 
  struct gf_cli_req {