glusterd: gluster volume status should show status of bitrot and scrubber daemon

Command gluster volume status <VOLNAME> should show the status of bitrot
and scrubber daemon and its pid information.

Along with displaying bitrot and scrubber daemon information in gluster
volume status command there should be command to show its individual status
separately.
Command to show individual status of bitrot and scrubber daemon will
following.

command to show only bitd daemon information will be
gluster volume status <VOLNAME> bitd

command to show only scrubber daemon information
gluster volume status <VOLNAME> scrub

Change-Id: Id86aae1156c8c599347c98e2a538f294d37376e4
BUG: 1218123
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/10175
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Kaushal M <kaushal@redhat.com>
(cherry picked from commit da1416051d19d612d131acfde8589bc8658979b5)
Reviewed-on: http://review.gluster.org/10519
Tested-by: Gluster Build System <jenkins@build.gluster.com>

1 files changed, 98 insertions, 0 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index a52fcd1ac2f..e2bbd2d5c42 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1394,6 +1394,22 @@ glusterd_op_stage_status_volume (dict_t *dict, char **op_errstr)
                                   "quota enabled", volname);
                         goto out;
                 }
+        } else if ((cmd & GF_CLI_STATUS_BITD) != 0) {
+                if (!glusterd_is_bitrot_enabled (volinfo)) {
+                        ret = -1;
+                        snprintf (msg, sizeof (msg), "Volume %s does not have "
+                                  "bitrot enabled", volname);
+                        goto out;
+                }
+        } else if ((cmd & GF_CLI_STATUS_SCRUB) != 0) {
+                if (!glusterd_is_bitrot_enabled (volinfo)) {
+                        ret = -1;
+                        snprintf (msg, sizeof (msg), "Volume %s does not have "
+                                  "bitrot enabled. Scrubber will be enabled "
+                                  "automatically if bitrot is enabled",
+                                  volname);
+                        goto out;
+                }
         } else if ((cmd & GF_CLI_STATUS_SNAPD) != 0) {
                 if (!glusterd_is_snapd_enabled (volinfo)) {
                         ret = -1;
@@ -2771,6 +2787,20 @@ glusterd_op_status_volume (dict_t *dict, char **op_errstr,
                         goto out;
                 other_count++;
                 node_count++;
+        } else if ((cmd & GF_CLI_STATUS_BITD) != 0) {
+                ret = glusterd_add_node_to_dict (priv->bitd_svc.name,
+                                                 rsp_dict, 0, vol_opts);
+                if (ret)
+                        goto out;
+                other_count++;
+                node_count++;
+        } else if ((cmd & GF_CLI_STATUS_SCRUB) != 0) {
+                ret = glusterd_add_node_to_dict (priv->scrub_svc.name,
+                                                 rsp_dict, 0, vol_opts);
+                if (ret)
+                        goto out;
+                other_count++;
+                node_count++;
         } else if ((cmd & GF_CLI_STATUS_SNAPD) != 0) {
                 ret = glusterd_add_node_to_dict ("snapd", rsp_dict, 0,
                                                  vol_opts);
@@ -2876,6 +2906,34 @@ glusterd_op_status_volume (dict_t *dict, char **op_errstr,
                                         goto out;
                                 other_count++;
                                 node_count++;
+                                other_index++;
+                        }
+
+                        if (glusterd_is_bitrot_enabled (volinfo)) {
+                                ret = glusterd_add_node_to_dict
+                                                        (priv->bitd_svc.name,
+                                                         rsp_dict,
+                                                         other_index,
+                                                         vol_opts);
+                                if (ret)
+                                        goto out;
+                                other_count++;
+                                node_count++;
+                                other_index++;
+                        }
+
+                        /* For handling scrub status. Scrub daemon will be
+                         * running automatically when bitrot is enable*/
+                        if (glusterd_is_bitrot_enabled (volinfo)) {
+                                ret = glusterd_add_node_to_dict
+                                                        (priv->scrub_svc.name,
+                                                         rsp_dict,
+                                                         other_index,
+                                                         vol_opts);
+                                if (ret)
+                                        goto out;
+                                other_count++;
+                                node_count++;
                         }
                 }
         }
@@ -5984,6 +6042,8 @@ glusterd_bricks_select_status_volume (dict_t *dict, char **op_errstr,
         case GF_CLI_STATUS_SHD:
         case GF_CLI_STATUS_QUOTAD:
         case GF_CLI_STATUS_SNAPD:
+        case GF_CLI_STATUS_BITD:
+        case GF_CLI_STATUS_SCRUB:
                 break;
         default:
                 goto out;
@@ -6084,6 +6144,44 @@ glusterd_bricks_select_status_volume (dict_t *dict, char **op_errstr,
                 cds_list_add_tail (&pending_node->list, selected);
 
                 ret = 0;
+        } else if ((cmd & GF_CLI_STATUS_BITD) != 0) {
+                if (!priv->bitd_svc.online) {
+                        gf_log (this->name, GF_LOG_ERROR, "Bitrot is not "
+                                "running");
+                        ret = -1;
+                        goto out;
+                }
+                pending_node = GF_CALLOC (1, sizeof (*pending_node),
+                                          gf_gld_mt_pending_node_t);
+                if (!pending_node) {
+                        ret = -1;
+                        goto out;
+                }
+                pending_node->node = &(priv->bitd_svc);
+                pending_node->type = GD_NODE_BITD;
+                pending_node->index = 0;
+                cds_list_add_tail (&pending_node->list, selected);
+
+                ret = 0;
+        } else if ((cmd & GF_CLI_STATUS_SCRUB) != 0) {
+                if (!priv->scrub_svc.online) {
+                        gf_log (this->name, GF_LOG_ERROR, "Scrubber is not "
+                                "running");
+                        ret = -1;
+                        goto out;
+                }
+                pending_node = GF_CALLOC (1, sizeof (*pending_node),
+                                          gf_gld_mt_pending_node_t);
+                if (!pending_node) {
+                        ret = -1;
+                        goto out;
+                }
+                pending_node->node = &(priv->scrub_svc);
+                pending_node->type = GD_NODE_SCRUB;
+                pending_node->index = 0;
+                cds_list_add_tail (&pending_node->list, selected);
+
+                ret = 0;
         } else if ((cmd & GF_CLI_STATUS_SNAPD) != 0) {
                 if (!volinfo->snapd.svc.online) {
                         gf_log (this->name, GF_LOG_ERROR, "snapd is not "