diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-12-01 09:11:01 +0000 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-12-11 10:52:14 -0800 |
| commit | 6746376747b0a06def2faff1b6af4b8bd624ed55 (patch) | |
| tree | e4ecc490c2a6db0f09a6ef0a7bef93150b436eae /xlators/mgmt/glusterd | |
| parent | 61e08fa705fad33243fd1da7b4ace4f14900d567 (diff) | |
tier/glusterd: Check before starting tier daemon during volume start
We start tier daemon when volume is started without looking into the
previous status. The problem with that if detach-tier is started
and then volume force start is actually starting tier daemon.
This is also fixes a problem where tier daemon is not starting
after detach stop.
Back port of>
>Change-Id: I15b56a711e12f0e24f5ab123561258bd448621f7
>BUG: 1286974
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/12833
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
(cherry picked from commit 28da53e26e88f23f8917810ce0177f2628aa7e9a)
Change-Id: I22c9ad0b2bc4488c15978d8bf85d05113e8b886e
BUG: 1289898
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/12921
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-mgmt.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 9 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 10 |
3 files changed, 18 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c index 286007e8041..c5e942296c8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c @@ -400,10 +400,12 @@ gd_mgmt_v3_post_validate_fn (glusterd_op_t op, int32_t op_ret, dict_t *dict, } if (volinfo->type == GF_CLUSTER_TYPE_TIER) { - glusterd_defrag_info_set (volinfo, dict, + if (volinfo->rebal.op != GD_OP_REMOVE_BRICK) { + glusterd_defrag_info_set (volinfo, dict, GF_DEFRAG_CMD_START_TIER, GF_DEFRAG_CMD_START, GD_OP_REBALANCE); + } glusterd_restart_rebalance_for_volume (volinfo); } break; diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index e232511d7c6..1dea5470738 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -928,6 +928,15 @@ glusterd_op_rebalance (dict_t *dict, char **op_errstr, dict_t *rsp_dict) goto out; } + if (volinfo->type == GF_CLUSTER_TYPE_TIER && + cmd == GF_OP_CMD_STOP_DETACH_TIER) { + glusterd_defrag_info_set (volinfo, dict, + GF_DEFRAG_CMD_START_TIER, + GF_DEFRAG_CMD_START, + GD_OP_REBALANCE); + glusterd_restart_rebalance_for_volume (volinfo); + } + ret = 0; break; diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index 60ed3ccb677..d910ad11008 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -2533,10 +2533,12 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr) * Please upgrade to version greater than GD_OP_VERSION_3_7_6 */ if (volinfo->type == GF_CLUSTER_TYPE_TIER) { - glusterd_defrag_info_set (volinfo, dict, - GF_DEFRAG_CMD_START_TIER, - GF_DEFRAG_CMD_START, - GD_OP_REBALANCE); + if (volinfo->rebal.op != GD_OP_REMOVE_BRICK) { + glusterd_defrag_info_set (volinfo, dict, + GF_DEFRAG_CMD_START_TIER, + GF_DEFRAG_CMD_START, + GD_OP_REBALANCE); + } glusterd_restart_rebalance_for_volume (volinfo); } } else { |