From abaf577626650edb4b9dfdddd43ba04a2a8e8ef3 Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Mon, 12 Jun 2017 11:17:01 +0530 Subject: 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: 1460993 Signed-off-by: Krutika Dhananjay Reviewed-on: https://review.gluster.org/17532 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 10 ---------- xlators/mgmt/glusterd/src/glusterd-rebalance.c | 9 --------- 2 files changed, 19 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 5bb347cd6d8..1fc28b2da55 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 2b43e181ccb..e293de22e58 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -691,15 +691,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)) { -- cgit