From d05708d7976a8340ae7647fd26f38f22f1863b6a Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Wed, 14 Mar 2012 15:35:51 +0530 Subject: dht: Rebalance status should display status from each process Change-Id: Id128417219bdb7146253618a5f8f31ef35013894 BUG: 801322 Signed-off-by: shishir gowda Reviewed-on: http://review.gluster.com/2942 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/mgmt/glusterd/src/glusterd-rebalance.c | 28 +------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-rebalance.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 936a3b26e..5d567e37a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -516,31 +516,8 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr) } break; case GF_DEFRAG_CMD_STATUS: - ret = glusterd_is_defrag_on (volinfo); - if (!ret) { - ret = -1; - if (volinfo->defrag_status == - GF_DEFRAG_STATUS_COMPLETE) { - snprintf (msg, sizeof (msg), "Rebalance " - "completed!"); - goto out; - } - snprintf (msg, sizeof(msg), "Rebalance is not running" - " on volume %s", volname); - goto out; - } - break; - case GF_DEFRAG_CMD_STOP: - ret = glusterd_is_defrag_on (volinfo); - if (!ret) { - gf_log (THIS->name, GF_LOG_DEBUG, - "rebalance is not running"); - ret = -1; - snprintf (msg, sizeof(msg), "Rebalance is not running" - " on volume %s", volname); - goto out; - } + break; default: break; } @@ -594,9 +571,6 @@ glusterd_op_rebalance (dict_t *dict, char **op_errstr, dict_t *rsp_dict) break; case GF_DEFRAG_CMD_STOP: case GF_DEFRAG_CMD_STATUS: - volinfo->rebalance_files = 0; - volinfo->rebalance_data = 0; - volinfo->lookedup_files = 0; break; default: break; -- cgit