From e8669dc707ffd60fea34c4b8b04f545a9169d5ee Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Mon, 9 Jan 2017 10:56:13 +0530 Subject: glusterd: bypass add-brick validation with force Commit c916a2f added a validation to restrict add-brick operation if a replica configuration is changed and any of the bricks belonging to the volume is down. However we should bypass this validation with a force option if users really want to have add-brick to go through at the sake of the corner cases of data loss issue. The original problem of add-brick getting failed when layout is not set will still be a problem with a force option as the issue has to be taken care in the DHT layer. Change-Id: I0ed3df91ea712f77674eb8afc6fdfa577f25a7bb BUG: 1406411 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/16358 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Ravishankar N CentOS-regression: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-brick-ops.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 08a878388a3..938663ba863 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1724,7 +1724,9 @@ glusterd_op_stage_add_brick (dict_t *dict, char **op_errstr, dict_t *rsp_dict) } } - if (volinfo->replica_count < replica_count) { + is_force = dict_get_str_boolean (dict, "force", _gf_false); + + if (volinfo->replica_count < replica_count && !is_force) { cds_list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { if (gf_uuid_compare (brickinfo->uuid, MY_UUID)) @@ -1812,8 +1814,6 @@ glusterd_op_stage_add_brick (dict_t *dict, char **op_errstr, dict_t *rsp_dict) goto out; } - is_force = dict_get_str_boolean (dict, "force", _gf_false); - if (bricks) { brick_list = gf_strdup (bricks); all_bricks = gf_strdup (bricks); -- cgit