74b1de
From be925e84edcecd879e953bdb68c10f98825dba53 Mon Sep 17 00:00:00 2001
74b1de
From: Shwetha K Acharya <sacharya@redhat.com>
74b1de
Date: Mon, 3 Jun 2019 18:05:24 +0530
74b1de
Subject: [PATCH 186/192] cli: Remove-brick warning seems unnecessary
74b1de
74b1de
As force-migration option is disabled by default,
74b1de
the warning seems unnessary.
74b1de
74b1de
Rephrased the warning to make best sense out of it.
74b1de
74b1de
>fixes: bz#1712668
74b1de
>Change-Id: Ia18c3c5e7b3fec808fce2194ca0504a837708822
74b1de
>Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
74b1de
74b1de
backport of https://review.gluster.org/#/c/glusterfs/+/22805/
74b1de
74b1de
Bug: 1708183
74b1de
Change-Id: Ia18c3c5e7b3fec808fce2194ca0504a837708822
74b1de
Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
74b1de
Reviewed-on: https://code.engineering.redhat.com/gerrit/173447
74b1de
Tested-by: RHGS Build Bot <nigelb@redhat.com>
74b1de
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
---
74b1de
 cli/src/cli-cmd-volume.c | 17 +++++++++--------
74b1de
 1 file changed, 9 insertions(+), 8 deletions(-)
74b1de
74b1de
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
74b1de
index 564aef7..a42e663 100644
74b1de
--- a/cli/src/cli-cmd-volume.c
74b1de
+++ b/cli/src/cli-cmd-volume.c
74b1de
@@ -2090,14 +2090,15 @@ cli_cmd_volume_remove_brick_cbk(struct cli_state *state,
74b1de
             " on the volume.\nDo you want to continue?";
74b1de
     } else if (command == GF_OP_CMD_START) {
74b1de
         question =
74b1de
-            "Running remove-brick with cluster.force-migration"
74b1de
-            " enabled can result in data corruption. It is safer"
74b1de
-            " to disable this option so that files that receive "
74b1de
-            "writes during migration are not migrated.\nFiles "
74b1de
-            "that are not migrated can then be manually copied "
74b1de
-            "after the remove-brick commit operation.\nDo you "
74b1de
-            "want to continue with your current "
74b1de
-            "cluster.force-migration settings?";
74b1de
+            "It is recommended that remove-brick be run with"
74b1de
+            " cluster.force-migration option disabled to prevent"
74b1de
+            " possible data corruption. Doing so will ensure that"
74b1de
+            " files that receive writes during migration will not"
74b1de
+            " be migrated and will need to be manually copied"
74b1de
+            " after the remove-brick commit operation. Please"
74b1de
+            " check the value of the option and update accordingly."
74b1de
+            " \nDo you want to continue with your current"
74b1de
+            " cluster.force-migration settings?";
74b1de
     }
74b1de
 
74b1de
     if (!brick_count) {
74b1de
-- 
74b1de
1.8.3.1
74b1de