summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkatesh Somyajulu <vsomyaju@redhat.com>2014-02-25 17:28:10 +0530
committerVijay Bellur <vbellur@redhat.com>2014-07-14 10:33:41 -0700
commit78128afce1b6476b3f23e4ca74d654934ac1ca2f (patch)
treecfd36d88498a6fd3351cbabb4bdcecfdf264bf33
parentf924f8e28b2d4753e4c4bc89a83d4ab330205de2 (diff)
cli: Changed "rebalance start" output
Change-Id: Ie87f1a2107b07a6e519ed894a74edf3b3e0a8340 BUG: 1063230 Signed-off-by: Venkatesh Somyajulu <vsomyaju@redhat.com> Reviewed-on: http://review.gluster.org/6946 Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--cli/src/cli-rpc-ops.c6
-rwxr-xr-xtests/bugs/bug-1063230.t29
2 files changed, 33 insertions, 2 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 0575440e486..ee7d3b2c841 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1471,8 +1471,10 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
} else {
if (!rsp.op_ret) {
snprintf (msg, sizeof (msg),
- "Starting rebalance on volume %s has "
- "been successful.\nID: %s", volname,
+ "Initiated rebalance on volume %s."
+ "\nExecute \"gluster volume rebalance"
+ " <volume-name> status\" to check"
+ " status.\nID: %s", volname,
task_id_str);
} else {
snprintf (msg, sizeof (msg),
diff --git a/tests/bugs/bug-1063230.t b/tests/bugs/bug-1063230.t
new file mode 100755
index 00000000000..f10a53433eb
--- /dev/null
+++ b/tests/bugs/bug-1063230.t
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+cleanup;
+
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume create $V0 $H0:$B0/brick0 $H0:$B0/brick1
+TEST $CLI volume start $V0
+
+sleep 5
+
+TEST glusterfs -s $H0 --volfile-id $V0 $M0
+
+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"
+
+
+echo $var | grep "$var1"
+
+EXPECT "0" echo $?
+
+cleanup