diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2016-10-25 19:57:02 +0530 |
|---|---|---|
| committer | Mohit Agrawal <moagrawa@redhat.com> | 2017-10-11 15:32:57 +0530 |
| commit | c49fcf570439e47a5e1224436bbaf3f8dd580105 (patch) | |
| tree | 0bbcc161927826f79ba453162342402b3229e9df /cli | |
| parent | a4fea86c5203838422f5e3bc4c764a0c655392ee (diff) | |
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 <vol-name>"
Note: After apply the patch options (healed | heal-failed) will deprecate
from command line.
> BUG: 1388509
> Change-Id: I229c320c9caeb2525c76b78b44a53a64b088545a
> Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
> (Cherry pick from commit d1f15cdeb609a1b720a04a502f7a63b2d3922f41)
BUG: 1500662
Change-Id: I229c320c9caeb2525c76b78b44a53a64b088545a
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 10 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 2 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 13 |
3 files changed, 8 insertions, 17 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index a613e5dee60..c8ed3673847 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -3824,16 +3824,6 @@ cli_cmd_volume_heal_options_parse (const char **words, int wordcount, } if (!strcmp (words[3], "info")) { - if (!strcmp (words[4], "healed")) { - ret = dict_set_int32 (dict, "heal-op", - GF_SHD_OP_HEALED_FILES); - goto done; - } - if (!strcmp (words[4], "heal-failed")) { - ret = dict_set_int32 (dict, "heal-op", - GF_SHD_OP_HEAL_FAILED_FILES); - goto done; - } if (!strcmp (words[4], "split-brain")) { ret = dict_set_int32 (dict, "heal-op", GF_SHD_OP_SPLIT_BRAIN_FILES); diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 829a56458e3..ca9da0aa2d3 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -3298,7 +3298,7 @@ struct cli_cmd volume_cmds[] = { { "volume heal <VOLNAME> [enable | disable | full |" "statistics [heal-count [replica <HOSTNAME:BRICKNAME>]] |" - "info [healed | heal-failed | split-brain] |" + "info [summary | split-brain] |" "split-brain {bigger-file <FILE> | latest-mtime <FILE> |" "source-brick <HOSTNAME:BRICKNAME> [<FILE>]} |" "granular-entry-heal {enable | disable}]", diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 03071dd9e45..207534b30b3 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -9005,13 +9005,13 @@ gf_cli_heal_volume_cbk (struct rpc_req *req, struct iovec *iov, operation = "Launching heal operation "; heal_op_str = "to perform index self heal"; substr = "\nUse heal info commands to check" - " status"; + " status."; break; case GF_SHD_OP_HEAL_FULL: operation = "Launching heal operation "; heal_op_str = "to perform full self heal"; substr = "\nUse heal info commands to check" - " status"; + " status."; break; case GF_SHD_OP_INDEX_SUMMARY: heal_op_str = "list of entries to be healed"; @@ -9063,10 +9063,11 @@ gf_cli_heal_volume_cbk (struct rpc_req *req, struct iovec *iov, } if (rsp.op_ret) { - cli_err ("%s%s on volume %s has been unsuccessful on " - "bricks that are down. Please check if all brick " - "processes are running.", - operation, heal_op_str, volname); + if (strcmp (rsp.op_errstr, "")) { + cli_err ("%s%s on volume %s has been unsuccessful:", + operation, heal_op_str, volname); + cli_err ("%s", rsp.op_errstr); + } ret = rsp.op_ret; goto out; } else { |