diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-02 17:31:07 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-09 10:26:36 -0700 |
| commit | ec055e1e6908ac829efc103deb548cc0a774cf23 (patch) | |
| tree | f16809b02ecf9c4cc17785b2a4a8e705f8101a98 /xlators | |
| parent | c5866f0575216727e38af3500b32e81e1efc72b7 (diff) | |
cli/tiering: Enhance cli output for tiering
back port of http://review.gluster.org/10284
Fix for handling cli output for attach-tier and
detach-tier
>Change-Id: I4d17f4b09612754fe1b8cec6c2e14927029b9678
>BUG: 1211562
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/10284
>Reviewed-by: Dan Lambright <dlambrig@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System
>Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Change-Id: Ic30c8f0a104d89bf98f5d0069937a34674ee3f2d
BUG: 1220052
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/10713
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index cffabfe34e2..6ed65976aea 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1671,10 +1671,12 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) } case GF_OP_CMD_STOP: + case GF_OP_CMD_STOP_DETACH_TIER: ret = 0; break; case GF_OP_CMD_COMMIT: + case GF_OP_CMD_DETACH_COMMIT: if (volinfo->decommission_in_progress) { errstr = gf_strdup ("use 'force' option as migration " "is in progress"); @@ -1724,7 +1726,6 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) break; - case GF_OP_CMD_DETACH_COMMIT: case GF_OP_CMD_DETACH_COMMIT_FORCE: case GF_OP_CMD_COMMIT_FORCE: break; @@ -2014,6 +2015,7 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr) goto out; case GF_OP_CMD_STOP: + case GF_OP_CMD_STOP_DETACH_TIER: { /* Fall back to the old volume file */ cds_list_for_each_entry_safe (brickinfo, tmp, &volinfo->bricks, diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 84d9210a105..48d9a706042 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -681,6 +681,13 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr) goto out; } } + if ((strstr(cmd_str, "detach-tier") != NULL) && + (volinfo->rebal.op != GD_OP_REMOVE_BRICK)) { + snprintf (msg, sizeof(msg), "Detach-tier not started."); + ret = -1; + goto out; + } + break; default: break; |