50dc83
From 039a3f81209706261fc809eac94564e81a3377da Mon Sep 17 00:00:00 2001
50dc83
From: Sanju Rakonde <srakonde@redhat.com>
50dc83
Date: Wed, 25 Sep 2019 14:55:19 +0530
50dc83
Subject: [PATCH 300/302] cli: remove the warning displayed when remove brick
50dc83
 start issued
50dc83
50dc83
remove-brick start command gives displays below error:
50dc83
50dc83
It is recommended that remove-brick be run with cluster.force-migration
50dc83
option disabled to prevent possible data corruption. Doing so will ensure
50dc83
that files that receive writes during migration will not be migrated and
50dc83
will need to be manually copied after the remove-brick commit operation.
50dc83
Please check the value of the option and update accordingly.
50dc83
Do you want to continue with your current cluster.force-migration settings? (y/n)
50dc83
50dc83
As we are not qualifying cluster.force-migration for 3.5.0,
50dc83
we should not display this message. So, removing it.
50dc83
50dc83
Label: DOWNSTREAM ONLY
50dc83
50dc83
BUG: 1755227
50dc83
Change-Id: I409f2059d43c5e867788f19d2ccb8d6d839520f7
50dc83
fixes: bz#1755227
50dc83
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
50dc83
Reviewed-on: https://code.engineering.redhat.com/gerrit/182009
50dc83
Tested-by: RHGS Build Bot <nigelb@redhat.com>
50dc83
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
50dc83
---
50dc83
 cli/src/cli-cmd-parser.c |  2 --
50dc83
 cli/src/cli-cmd-volume.c | 11 -----------
50dc83
 2 files changed, 13 deletions(-)
50dc83
50dc83
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
50dc83
index 92ceb8e..4456a7b 100644
50dc83
--- a/cli/src/cli-cmd-parser.c
50dc83
+++ b/cli/src/cli-cmd-parser.c
50dc83
@@ -2101,8 +2101,6 @@ cli_cmd_volume_remove_brick_parse(struct cli_state *state, const char **words,
50dc83
         wordcount--;
50dc83
         if (!strcmp("start", w)) {
50dc83
             command = GF_OP_CMD_START;
50dc83
-            if (question)
50dc83
-                *question = 1;
50dc83
         } else if (!strcmp("commit", w)) {
50dc83
             command = GF_OP_CMD_COMMIT;
50dc83
         } else if (!strcmp("stop", w)) {
50dc83
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
50dc83
index a42e663..6b958bd 100644
50dc83
--- a/cli/src/cli-cmd-volume.c
50dc83
+++ b/cli/src/cli-cmd-volume.c
50dc83
@@ -2088,17 +2088,6 @@ cli_cmd_volume_remove_brick_cbk(struct cli_state *state,
50dc83
             "Remove-brick force will not migrate files from the "
50dc83
             "removed bricks, so they will no longer be available"
50dc83
             " on the volume.\nDo you want to continue?";
50dc83
-    } else if (command == GF_OP_CMD_START) {
50dc83
-        question =
50dc83
-            "It is recommended that remove-brick be run with"
50dc83
-            " cluster.force-migration option disabled to prevent"
50dc83
-            " possible data corruption. Doing so will ensure that"
50dc83
-            " files that receive writes during migration will not"
50dc83
-            " be migrated and will need to be manually copied"
50dc83
-            " after the remove-brick commit operation. Please"
50dc83
-            " check the value of the option and update accordingly."
50dc83
-            " \nDo you want to continue with your current"
50dc83
-            " cluster.force-migration settings?";
50dc83
     }
50dc83
 
50dc83
     if (!brick_count) {
50dc83
-- 
50dc83
1.8.3.1
50dc83