glusterd/tier: configure tier daemon during volume restart

rebalance daemon will be running on every tier volume for
promoting/demoting the files. When volume/glusterd is restarted,
then we need to configure the daemon.

Back port of >
>Change-Id: Ib565240a70edea2ec8bc1601c52b40c0783491d3
>BUG: 1225330
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Signed-off-by: Joseph Fernandes <josferna@redhat.com>
>Reviewed-on: http://review.gluster.org/10933
>Reviewed-by: Dan Lambright <dlambrig@redhat.com>
>Tested-by: Dan Lambright <dlambrig@redhat.com>

(cherry picked from commit 7aaa414c67be460aca3c1c5eed047e3db17bd435)

Change-Id: Id15f5a18fd2ebaf8642b02561ae3666e619e3f83
BUG: 1235202
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/11376
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>

1 files changed, 36 insertions, 9 deletions

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;
 }