4 files changed, 56 insertions, 13 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index bd8a8bb13d4..69f120efd3d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -140,7 +140,8 @@ __glusterd_defrag_notify (struct rpc_clnt *rpc, void *mydata,
                 UNLOCK (&defrag->lock);
 
                 if (!gf_is_service_running (pidfile, NULL)) {
-                        if (volinfo->rebal.defrag_status ==
+                        if (volinfo->type != GF_CLUSTER_TYPE_TIER &&
+                            volinfo->rebal.defrag_status ==
                                                 GF_DEFRAG_STATUS_STARTED) {
                                 volinfo->rebal.defrag_status =
                                                    GF_DEFRAG_STATUS_FAILED;
@@ -204,9 +205,6 @@ glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr,
         GF_ASSERT (volinfo);
         GF_ASSERT (op_errstr);
 
-        if ((cmd == GF_OP_CMD_DETACH_START) &&
-            (volinfo->rebal.defrag_status == GF_DEFRAG_STATUS_STARTED))
-                return 0;
 
         ret = glusterd_defrag_start_validate (volinfo, op_errstr, len, op);
         if (ret)
@@ -636,6 +634,13 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr)
                         ret = -1;
                         goto out;
                 }
+                if (glusterd_is_tier_daemon_running (volinfo)) {
+                        ret = gf_asprintf (op_errstr, "A Tier daemon is "
+                                           "already running on volume %s",
+                                           volname);
+                        ret = -1;
+                        goto out;
+                }
         case GF_DEFRAG_CMD_START:
         case GF_DEFRAG_CMD_START_LAYOUT_FIX:
                 /* Check if the connected clients are all of version
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index c284c547c84..beaad551f2a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -5458,11 +5458,32 @@ out:
         return ret;
 }
 
+gf_boolean_t
+glusterd_is_tier_daemon_running (glusterd_volinfo_t *volinfo)
+{
+        if (volinfo->type != GF_CLUSTER_TYPE_TIER)
+                return _gf_false;
+
+        if (volinfo->rebal.defrag &&
+             volinfo->rebal.defrag_cmd == GF_DEFRAG_CMD_START_TIER) {
+                return _gf_true;
+        }
+
+        return _gf_false;
+
+}
+
+
 int
 glusterd_is_defrag_on (glusterd_volinfo_t *volinfo)
 {
-        /* Defrag is never enabled for tiered volumes. */
-        if (volinfo->type == GF_CLUSTER_TYPE_TIER)
+        /*
+         * Do not need to consider tier daemon as a rebalance
+         * daemon and with current design rebalance is not supported
+         * on a tiered volume.
+         */
+
+        if (glusterd_is_tier_daemon_running (volinfo))
                 return 0;
 
         return (volinfo->rebal.defrag != NULL);
@@ -6794,21 +6815,27 @@ glusterd_volume_defrag_restart (glusterd_volinfo_t *volinfo, char *op_errstr,
 
         return ret;
 }
+void
+glusterd_restart_rebalance_for_volume (glusterd_volinfo_t *volinfo)
+{
+
+        char          op_errstr[PATH_MAX];
 
+        if (!volinfo->rebal.defrag_cmd)
+                return;
+        if (!gd_should_i_start_rebalance (volinfo))
+                return;
+        glusterd_volume_defrag_restart (volinfo, op_errstr, PATH_MAX,
+                                volinfo->rebal.defrag_cmd, NULL);
+}
 int
 glusterd_restart_rebalance (glusterd_conf_t *conf)
 {
         glusterd_volinfo_t       *volinfo = NULL;
         int                      ret = 0;
-        char                     op_errstr[256];
 
         cds_list_for_each_entry (volinfo, &conf->volumes, vol_list) {
-                if (!volinfo->rebal.defrag_cmd)
-                        continue;
-                if (!gd_should_i_start_rebalance (volinfo))
-                        continue;
-                glusterd_volume_defrag_restart (volinfo, op_errstr, 256,
-                                        volinfo->rebal.defrag_cmd, NULL);
+                glusterd_restart_rebalance_for_volume (volinfo);
         }
         return ret;
 }
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h
index 44fcdd37742..ac96850ac9b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.h
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.h
@@ -225,6 +225,10 @@ glusterd_brick_stop (glusterd_volinfo_t *volinfo,
                      glusterd_brickinfo_t *brickinfo,
                      gf_boolean_t del_brick);
 
+gf_boolean_t
+glusterd_is_tier_daemon_running (glusterd_volinfo_t *volinfo);
+
+
 int
 glusterd_is_defrag_on (glusterd_volinfo_t *volinfo);
 
@@ -362,6 +366,9 @@ glusterd_get_trusted_client_filepath (char *filepath,
 int
 glusterd_restart_rebalance (glusterd_conf_t *conf);
 
+void
+glusterd_restart_rebalance_for_volume (glusterd_volinfo_t *volinfo);
+
 int32_t
 glusterd_add_bricks_hname_path_to_dict (dict_t *dict,
                                         glusterd_volinfo_t *volinfo);
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index 0018a700747..99a7377928e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -2464,6 +2464,10 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr)
                         goto out;
         }
 
+        if (volinfo->type == GF_CLUSTER_TYPE_TIER) {
+                glusterd_restart_rebalance_for_volume (volinfo);
+        }
+
         ret = glusterd_svcs_manager (volinfo);
 
 out: