summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshishir gowda <shishirng@gluster.com>2010-10-19 03:02:10 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-10-24 23:17:49 -0700
commit5ca019f339d76187f26757222084319cd1b28ad6 (patch)
tree56d746b2552b220b1d48de768c56356b26247bae
parent54219ecf2ad344a55e974ff4b86a02408c9c17f2 (diff)
Propogate rebalance already started error to cli
Signed-off-by: shishir gowda <shishirng@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1882 (starting rebalance while previous rebalance is still running) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1882
-rw-r--r--cli/src/cli3_1-cops.c3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rebalance.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index ee66b165f..9e1338cb3 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -770,6 +770,9 @@ gf_cli3_1_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
if (cmd == GF_DEFRAG_CMD_START) {
cli_out ("starting rebalance on volume %s has been %s", volname,
(rsp.op_ret) ? "unsuccessful": "successful");
+ if (rsp.op_ret && rsp.op_errno == EEXIST)
+ cli_out ("Rebalance already started on volume %s",
+ volname);
}
if (cmd == GF_DEFRAG_CMD_STOP) {
if (rsp.op_ret == -1)
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index f3c5b9591..b1eed6419 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -412,6 +412,7 @@ glusterd_handle_defrag_volume (rpcsvc_request_t *req)
gf_log ("glusterd", GF_LOG_DEBUG,
"rebalance on volume %s already started",
cli_req.volname);
+ rsp.op_errno = EEXIST;
goto out;
}