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