diff options
author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-26 10:59:45 +0530 |
---|---|---|
committer | Dan Lambright <dlambrig@redhat.com> | 2015-06-19 09:58:49 -0700 |
commit | 7aaa414c67be460aca3c1c5eed047e3db17bd435 (patch) | |
tree | 944b0cfbaec2e5b28230d36d33c481c2030bb9c3 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
parent | 2fea88d70b2fb9d479f539509ae930ac6f05eb5c (diff) |
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.
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>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 45 |
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 48216f61989..1dcc3d3de50 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5432,11 +5432,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); @@ -6759,21 +6780,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; } |