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