diff options
| author | Aravinda VK <avishwan@redhat.com> | 2013-09-24 12:41:30 +0530 | 
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-10-03 21:12:38 -0700 | 
| commit | 7dba6f9b556288a95d6ca7e9c3222d14cae3def5 (patch) | |
| tree | 4556afdf08339fd17466c299b75fdeffb4f52d4d /cli/src | |
| parent | 59b4e379e6d56af4828738c966b80c313415f632 (diff) | |
cli: runtime in xml output of rebalance/remove-brick status
"runtime in secs" is available in the CLI output of
rebalance status and remove-brick status, but not available
in xml output when --xml is passed.
runtime in aggregate section will be max of all nodes runtimes.
Example output:
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <opRet>0</opRet>
  <opErrno>0</opErrno>
  <opErrstr/>
  <volRebalance>
    <op>3</op>
    <nodeCount>1</nodeCount>
    <node>
      <nodeName>localhost</nodeName>
      <files>0</files>
      <size>0</size>
      <lookups>0</lookups>
      <failures>0</failures>
      <skipped>0</skipped>
      <runtime>1.00</runtime>
      <status>3</status>
      <statusStr>completed</statusStr>
    </node>
    <aggregate>
      <files>0</files>
      <size>0</size>
      <lookups>0</lookups>
      <failures>0</failures>
      <skipped>0</skipped>
      <runtime>1.00</runtime>
      <status>3</status>
      <statusStr>completed</statusStr>
    </aggregate>
  </volRebalance>
</cliOutput>
BUG: 1012773
Change-Id: I8deaba08922a53cd2d3b411e097a7b3cf591b127
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/5997
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/cli-xml-output.c | 21 | 
1 files changed, 21 insertions, 0 deletions
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index b57a17a8961..cb42e303dac 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -3003,6 +3003,8 @@ cli_xml_output_vol_rebalance_status (xmlTextWriterPtr writer, dict_t *dict,          char                    key[1024] = {0,};          int                     i = 0;          int                     overall_status = -1; +        double                  elapsed = 0; +        double                  overall_elapsed = 0;          if (!dict) {                  ret = 0; @@ -3112,6 +3114,21 @@ cli_xml_output_vol_rebalance_status (xmlTextWriterPtr writer, dict_t *dict,                                                         (xmlChar *)"statusStr",                                                         "%s",                                           cli_vol_task_status_str[status_rcd]); + +                memset (key, 0, 256); +                snprintf (key, 256, "run-time-%d", i); +                ret = dict_get_double (dict, key, &elapsed); +                if (ret) +                        goto out; +                ret = xmlTextWriterWriteFormatElement (writer, +                                                       (xmlChar *)"runtime", +                                                       "%.2f", elapsed); +                XML_RET_CHECK_AND_GOTO (ret, out); + +                if (elapsed > overall_elapsed) { +                    overall_elapsed = elapsed; +                } +                  if (-1 == overall_status)                          overall_status = status_rcd;                  else if ((GF_DEFRAG_STATUS_COMPLETE == overall_status || @@ -3159,6 +3176,10 @@ cli_xml_output_vol_rebalance_status (xmlTextWriterPtr writer, dict_t *dict,                                        cli_vol_task_status_str[overall_status]);          XML_RET_CHECK_AND_GOTO (ret, out); +        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"runtime", +                                               "%.2f", overall_elapsed); +        XML_RET_CHECK_AND_GOTO (ret, out); +          /* </aggregate> */          ret = xmlTextWriterEndElement (writer);          XML_RET_CHECK_AND_GOTO (ret, out);  | 
