diff options
| author | hari gowtham <hgowtham@redhat.com> | 2016-04-28 11:48:23 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-05-14 07:27:43 -0700 |
| commit | bf80f5a94b7d5e617612904723c2ae053e137d3b (patch) | |
| tree | dc1c3b94a96682dd178716199f6d1a4acdbff929 /cli | |
| parent | 95afed38767610313dbf1cfdc871d7648ce68d33 (diff) | |
heal/xml : xml implementation of heal info and splitbrain info
back-port of : http://review.gluster.org/#/c/14100/
Current output:
heal didn't have xml output.
expected output with patch:
gluster v heal v1 info --xml
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
<healInfo>
<bricks>
<brick hostUuid="3677edbb-0a6a-415e-b0ee-b846ff93259c">
<name>10.70.42.183:/home/bricks/b1</name>
<status>Connected</status>
<numberOfEntries>0</numberOfEntries>
</brick>
<brick hostUuid="3677edbb-0a6a-415e-b0ee-b846ff93259c">
<name>10.70.42.183:/home/bricks/b2</name>
<status>Connected</status>
<numberOfEntries>0</numberOfEntries>
</brick>
</bricks>
</healInfo>
<opRet>0</opRet>
<opErrno>0</opErrno>
<opErrstr/>
</cliOutput>
gluster v heal v1 info split-brain --xml
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
<healInfo>
<bricks>
<brick hostUuid="3677edbb-0a6a-415e-b0ee-b846ff93259c">
<name>10.70.42.183:/home/bricks/b1</name>
<status>Connected</status>
<numberOfEntries>0</numberOfEntries>
</brick>
<brick hostUuid="3677edbb-0a6a-415e-b0ee-b846ff93259c">
<name>10.70.42.183:/home/bricks/b2</name>
<status>Connected</status>
<numberOfEntries>0</numberOfEntries>
</brick>
</bricks>
</healInfo>
<opRet>0</opRet>
<opErrno>0</opErrno>
<opErrstr/>
</cliOutput>
>hange-Id: I20ad5eb7950d4721364ab46089e3af515162db82
>BUG: 1331287
>Signed-off-by: hari gowtham <hgowtham@redhat.com>
Change-Id: Ie2d74222213b71fb6c80d0384a35a1c705aafcd0
BUG: 1334074
Signed-off-by: hari gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/14250
Smoke: Gluster Build System <jenkins@build.gluster.com>
Tested-by: hari gowtham <hari.gowtham005@gmail.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index f5ee1b14544..bc4f42c5967 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -2172,6 +2172,9 @@ cli_launch_glfs_heal (int heal_op, dict_t *options) switch (heal_op) { case GF_SHD_OP_INDEX_SUMMARY: + if (global_state->mode & GLUSTER_MODE_XML) { + runner_add_args (&runner, "xml", NULL); + } break; case GF_SHD_OP_SBRAIN_HEAL_FROM_BIGGER_FILE: ret = dict_get_str (options, "file", &filename); @@ -2193,6 +2196,9 @@ cli_launch_glfs_heal (int heal_op, dict_t *options) break; case GF_SHD_OP_SPLIT_BRAIN_FILES: runner_add_args (&runner, "split-brain-info", NULL); + if (global_state->mode & GLUSTER_MODE_XML) { + runner_add_args (&runner, "xml", NULL); + } break; default: ret = -1; @@ -2262,8 +2268,10 @@ cli_cmd_volume_heal_cbk (struct cli_state *state, struct cli_cmd_word *word, out: if (ret) { cli_cmd_sent_status_get (&sent); - if ((sent == 0) && (parse_error == 0)) + if ((sent == 0) && (parse_error == 0) && + !(global_state->mode & GLUSTER_MODE_XML)) { cli_out ("Volume heal failed."); + } } CLI_STACK_DESTROY (frame); |