gluster/glusterfs
1
0
Fork 0
mirror of https://github.com/gluster/glusterfs.git synced 2026-02-06 18:48:16 +01:00
Code Issues Releases Wiki Activity

cli/xml: Fix wrong XML format in volume get command

Browse Source 
Without this Patch,
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <opRet>0</opRet>
  <opErrno>0</opErrno>
  <opErrstr/>
  <volGetopts>
    <count>258</count>
    <Option>cluster.lookup-unhashed</Option>
    <Value>on</Value>
    <Option>cluster.lookup-optimize</Option>
    <Value>off</Value>
    <Option>cluster.min-free-disk</Option>
    <Value>10%</Value>
    <Option>cluster.min-free-inodes</Option>
    <Value>5%</Value>...

With this patch,
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <opRet>0</opRet>
  <opErrno>0</opErrno>
  <opErrstr/>
  <volGetopts>
    <count>258</count>
    <Opt>
        <Option>cluster.lookup-unhashed</Option>
        <Value>on</Value>
    </Opt>
    <Opt>
        <Option>cluster.lookup-optimize</Option>
        <Value>off</Value>
    </Opt>
    <Opt>
        <Option>cluster.min-free-disk</Option>
        <Value>10%</Value>
    </Opt>
    <Opt>
        <Option>cluster.min-free-inodes</Option>
        <Value>5%</Value>
    </Opt>...

> Signed-off-by: Aravinda VK <avishwan@redhat.com>
> Reviewed-on: http://review.gluster.org/14931
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>

(cherry picked from commit bc0b106f0a)

BUG: 1357767
Change-Id: I6c5a040f659f2244ddcd47c57882b4f300cbe52f
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/14950
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
This commit is contained in:
Aravinda VK
2016-07-15 18:49:32 +05:30
committed by Atin Mukherjee
parent 89ae9c91c3
commit 757138048f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/cli-xml-output.c
View File

@@ -6194,6 +6194,9 @@ cli_xml_output_vol_getopts (dict_t *dict, int op_ret, int op_errno,
"the dictionary", dict_key);
goto out;
}
ret = xmlTextWriterStartElement (writer, (xmlChar *)"Opt");
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (writer,
(xmlChar *)"Option",
"%s", key);
@@ -6203,6 +6206,9 @@ cli_xml_output_vol_getopts (dict_t *dict, int op_ret, int op_errno,
(xmlChar *)"Value",
"%s", value);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterEndElement (writer);
XML_RET_CHECK_AND_GOTO (ret, out);
}
ret = cli_end_xml_output (writer, doc);