From bf152d98cee31a2346f3aec32301ca4a4bbfcea1 Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Thu, 30 Sep 2010 03:41:04 +0000 Subject: Block add, remove and replace brick ops when rebalance is in progress Also fixing msg, changing defrag to rebalance Signed-off-by: shishir gowda Signed-off-by: Vijay Bellur BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971 --- xlators/mgmt/glusterd/src/glusterd-handler.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index f66a5b3d28c..439facef0b9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -837,7 +837,7 @@ glusterd_defrag_start (void *data) volinfo->lookedup_files = defrag->num_files_lookedup; out: if (defrag) { - gf_log ("defrag", GF_LOG_NORMAL, "defrag on %s complete", + gf_log ("rebalance", GF_LOG_NORMAL, "rebalance on %s complete", defrag->mount); snprintf (cmd_str, 1024, "umount -l %s", defrag->mount); @@ -931,19 +931,19 @@ glusterd_handle_defrag_volume (rpcsvc_request_t *req) default: break; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received defrag volume on %s", + gf_log ("glusterd", GF_LOG_NORMAL, "Received rebalance volume on %s", cli_req.volname); rsp.volname = cli_req.volname; rsp.op_ret = -1; if (glusterd_volinfo_find(cli_req.volname, &volinfo)) { - gf_log ("glusterd", GF_LOG_NORMAL, "Received defrag on invalid" + gf_log ("glusterd", GF_LOG_NORMAL, "Received rebalance on invalid" " volname %s", cli_req.volname); goto out; } if (volinfo->status != GLUSTERD_STATUS_STARTED) { - gf_log ("glusterd", GF_LOG_NORMAL, "Received defrag on stopped" + gf_log ("glusterd", GF_LOG_NORMAL, "Received rebalance on stopped" " volname %s", cli_req.volname); goto out; } @@ -953,7 +953,7 @@ glusterd_handle_defrag_volume (rpcsvc_request_t *req) { if (volinfo->defrag) { gf_log ("glusterd", GF_LOG_DEBUG, - "defrag on volume %s already started", + "rebalance on volume %s already started", cli_req.volname); goto out; } -- cgit