diff options
| author | hari gowtham <hgowtham@redhat.com> | 2016-09-09 12:26:52 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2016-09-12 06:27:32 -0700 |
| commit | 1afa0bd91fd23b5131ccc1cceb814a061ac99096 (patch) | |
| tree | b0453b2714b5f5f4dedc26201ea6dfa699109be7 | |
| parent | 8ab0b25f4ee7ae207c9796b51b91c7fca6f47779 (diff) | |
Tier: failing detach commit on detach failure and in-progress
PROBLEM: if detach status has failed or if it remains in progress
we allow detach commit to happen. only detach force should
be allowed.
FIX: check the detach status for failure or inprogress and disallow
with the apt error message.
Change-Id: Ib97d540fec67717bb55c18d133187c665cf69ef1
BUG: 1374584
Signed-off-by: hari gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/15438
Smoke: Gluster Build System <jenkins@build.gluster.org>
Tested-by: hari gowtham <hari.gowtham005@gmail.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 8458876f50f..276c6df0aee 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -2227,6 +2227,17 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) GD_MSG_VOL_NOT_TIER, "%s", errstr); goto out; } + if (volinfo->decommission_in_progress) { + errstr = gf_strdup ("use 'force' option as migration " + "is in progress"); + goto out; + } + if (volinfo->rebal.defrag_status == GF_DEFRAG_STATUS_FAILED) { + errstr = gf_strdup ("use 'force' option as migration " + "has failed"); + goto out; + } + ret = glusterd_remove_brick_validate_bricks (cmd, brick_count, dict, volinfo, &errstr); |