summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShyamsundar Ranganathan <srangana@redhat.com>2017-06-26 16:23:45 +0000
committerShyamsundar Ranganathan <srangana@redhat.com>2017-06-27 14:04:55 +0000
commitc5ca4e8981bcf6a854eb3f708aa96fe6ff1f8e05 (patch)
treebf3f2557068a651b3d2e3b120a625198e6b5741c
parentf67dbab74a3d0a13a8f7ed31b8cc840c05042913 (diff)
Revert "Revert "glusterd: disallow rebalance & remove-brick on a sharded volume""
This is being reverted as a new bug around rebalance has been uncovered. As a result we would like to retain the warning in the code and in the release-notes. The new bug being, https://bugzilla.redhat.com/show_bug.cgi?id=1465075 This reverts commit 9c5403587517b5922cb87bff75033839e96d56ab. Change-Id: Ifd38ae0a41539aeb67723eb3ee704c18c50571b0 BUG: 1465123 Signed-off-by: Shyam <srangana@redhat.com> Reviewed-on: https://review.gluster.org/17631 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.c10
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rebalance.c9
2 files changed, 19 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index 8d4ea13..21e3377 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -2180,6 +2180,16 @@ 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 4c24b99..fbef1df 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -696,6 +696,15 @@ 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)) {