From d1f15cdeb609a1b720a04a502f7a63b2d3922f41 Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Tue, 25 Oct 2016 19:57:02 +0530 Subject: cli/afr: gluster volume heal info "healed" command output is not appropriate Problem: "gluster volume heal info [healed] [heal-failed]" command output on terminal is not appropriate in case of down any volume. Solution: To make message more appropriate change the condition in function "gd_syncop_mgmt_brick_op". Test : To verify the fix followed below procedure 1) Create 2*3 distribute replicate volume 2) set self-heal daemon off 3) kill two bricks (3, 6) 4) create some file on mount point 5) bring brick 3,6 up 6) kill other two brick (2 and 4) 7) make self heal daemon on 8) run "gluster v heal " Note: After apply the patch options (healed | heal-failed) will deprecate from command line. BUG: 1388509 Change-Id: I229c320c9caeb2525c76b78b44a53a64b088545a Signed-off-by: Mohit Agrawal --- xlators/mgmt/glusterd/src/glusterd-syncop.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c index aa47517c356..31b08d76adc 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.c +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c @@ -1039,6 +1039,19 @@ out: errno = args.op_errno; if (args.dict) dict_unref (args.dict); + if (args.op_ret && (*errstr == NULL)) { + if (op == GD_OP_HEAL_VOLUME) { + gf_asprintf (errstr, + "Glusterd Syncop Mgmt brick op '%s' failed." + " Please check glustershd log file for details.", + gd_op_list[op]); + } else { + gf_asprintf (errstr, + "Glusterd Syncop Mgmt brick op '%s' failed." + " Please check brick log file for details.", + gd_op_list[op]); + } + } gd_brick_op_req_free (req); return args.op_ret; } -- cgit