diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2017-06-12 11:17:01 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-06-19 15:48:25 +0000 |
| commit | 9c5403587517b5922cb87bff75033839e96d56ab (patch) | |
| tree | dc5887f1a9d39cd4171df3c1290e5d58dd1455f6 | |
| parent | df807e0ae37e57dd1ffd7ac2ac8e177d44877da0 (diff) | |
Revert "glusterd: disallow rebalance & remove-brick on a sharded volume"
This reverts commit 8375b3d70d5c6268c6770b42a18b2e1bc09e411e.
Backport of:
> Change-Id: I45493fcbb1f25fd0fff27b2b3526c42642ccb464
> BUG: 1460585
> Reviewed-on: https://review.gluster.org/17506
> (cherry-picked from c0d4081cf4b90a4316b786cc53263a7c56fdb344)
Now that some of the users have confirmed rebalance works fine without
causing corruption of VMs, time to revert the CLI restriction.
Change-Id: I45493fcbb1f25fd0fff27b2b3526c42642ccb464
BUG: 1460997
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: https://review.gluster.org/17533
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 10 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 21e3377b631..8d4ea13af95 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -2180,16 +2180,6 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) case GF_OP_CMD_START: { - if (dict_get_str_boolean (volinfo->dict, "features.shard", - _gf_false)) { - ret = -1; - snprintf (msg, sizeof (msg), "remove-brick operation is" - " not allowed on a sharded volume as it may" - " lead to a data loss situation."); - errstr = gf_strdup (msg); - goto out; - } - if ((volinfo->type == GF_CLUSTER_TYPE_REPLICATE) && dict_get (dict, "replica-count")) { snprintf (msg, sizeof(msg), "Migration of data is not " diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index fbef1df7eaa..4c24b99d0b8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -696,15 +696,6 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr) volname); goto out; } - if (dict_get_str_boolean (volinfo->dict, "features.shard", - _gf_false)) { - ret = -1; - snprintf (msg, sizeof (msg), "rebalance operation is not" - " allowed on a sharded volume as it may lead" - " to a data loss situation. Use start force " - " option to bypass this validation"); - goto out; - } case GF_DEFRAG_CMD_START_FORCE: if (is_origin_glusterd (dict)) { |