From c2a0e3f722583731599785d16f12be5b3472934b Mon Sep 17 00:00:00 2001
From: ggarg <ggarg@redhat.com>
Date: Mon, 14 Apr 2014 16:38:15 +0530
Subject: cli: Fixing ambiguous message error for rebalance <volname> start
 command

Previously output message of command 'gluster volume rebalance <volname>
start/start force/fix-layout start' was ambiguous and poorly formatted.
Previously output message was: "volume rebalance: <volname>: success:
Starting rebalance on volume <volname> has been successful."

Now with this fix properly formatted output message is:
"volume rebalance: <volname>: success: Rebalance on <volname> has been
started Successfully. Use rebalance status command to check status of
the rebalance process."

Change-Id: I23268fc13b05d1b39ffe4c702d0e4f73085acd1c
BUG: 1087487
Signed-off-by: ggarg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/7473
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 cli/src/cli-rpc-ops.c    | 10 +++++-----
 tests/bugs/bug-1063230.t |  6 +++---
 tests/bugs/bug-1087487.t | 23 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100755 tests/bugs/bug-1087487.t

diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index ac66b1a5662..bbb7e56590a 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1510,11 +1510,11 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 } else {
                         if (!rsp.op_ret) {
                                 snprintf (msg, sizeof (msg),
-                                          "Initiated rebalance on volume %s."
-                                          "\nExecute \"gluster volume rebalance"
-                                          " <volume-name> status\" to check"
-                                          " status.\nID: %s", volname,
-                                          task_id_str);
+                                          "Rebalance on %s has been started "
+                                          "successfully. Use rebalance status "
+                                          "command to check status of the "
+                                          "rebalance process.\nID: %s",
+                                          volname, task_id_str);
                         } else {
                                 snprintf (msg, sizeof (msg),
                                           "Starting rebalance on volume %s has "
diff --git a/tests/bugs/bug-1063230.t b/tests/bugs/bug-1063230.t
index f10a53433eb..a04be88e94e 100755
--- a/tests/bugs/bug-1063230.t
+++ b/tests/bugs/bug-1063230.t
@@ -18,9 +18,9 @@ var=`gluster volume rebalance $V0 start force`
 
 EXPECT "0" echo $?
 
-var1="Initiated rebalance on volume $V0. Execute \"gluster\
- volume rebalance <volume-name> status\" to check status"
-
+var1="volume rebalance: $V0: success: Rebalance on $V0 has \
+been started successfully. Use rebalance status command to \
+check status of the rebalance process."
 
 echo $var | grep "$var1"
 
diff --git a/tests/bugs/bug-1087487.t b/tests/bugs/bug-1087487.t
new file mode 100755
index 00000000000..d0cb0a32b4a
--- /dev/null
+++ b/tests/bugs/bug-1087487.t
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+cleanup;
+
+function rebalance_start {
+         $CLI volume rebalance $1 start | head -1;
+}
+
+TEST glusterd
+TEST pidof glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
+
+TEST $CLI volume start $V0
+
+EXPECT "volume rebalance: $V0: success: Rebalance on $V0 has \
+been started successfully. Use rebalance status command to \
+check status of the rebalance process." rebalance_start $V0
+
+cleanup;
-- 
cgit