diff options
| author | Manikandan Selvaganesh <mselvaga@redhat.com> | 2015-09-09 13:03:37 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-09-30 23:54:46 -0700 |
| commit | a0514409356c35cd90a0506ab9fafa7462b21bef (patch) | |
| tree | 679c00740c99706c186ea773b7dd9e9ed5f3c9eb /cli/src/cli-xml-output.c | |
| parent | 7f0bb9ca8281d022e37e1567ae24ce08436d4cd8 (diff) | |
quota : xml output modified to give exact available space in bytes
Currrently, 'gluster v quota <VOLNAME> list' command rounds off the
available space and shows it to the user. Now, 'gluster v quota
<VOLNAME> list --xml' command is modified to show the exact available
space in bytes.
Change-Id: I3772e036a2537c1df12f22cf32dfe4ac7940988f
BUG: 1261404
Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
Reviewed-on: http://review.gluster.org/12137
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'cli/src/cli-xml-output.c')
| -rw-r--r-- | cli/src/cli-xml-output.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 6167adbc73c..753966d7736 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -6184,9 +6184,9 @@ out: } int -cli_quota_xml_output (cli_local_t *local, char *path, char *hl_str, - char *sl_final, void *used, void *avail, char *sl, - char *hl) +cli_quota_xml_output (cli_local_t *local, char *path, int64_t hl_str, + char *sl_final, int64_t sl_num, int64_t used, + int64_t avail, char *sl, char *hl) { #if (HAVE_LIB_XML) int ret = -1; @@ -6201,34 +6201,27 @@ cli_quota_xml_output (cli_local_t *local, char *path, char *hl_str, ret = xmlTextWriterWriteFormatElement (local->writer, (xmlChar *)"hard_limit", - "%s", hl_str); + "%"PRIu64, hl_str); XML_RET_CHECK_AND_GOTO (ret, out); ret = xmlTextWriterWriteFormatElement (local->writer, - (xmlChar *)"soft_limit", + (xmlChar *)"soft_limit_percent", "%s", sl_final); XML_RET_CHECK_AND_GOTO (ret, out); - if ((char *)used) { - ret = xmlTextWriterWriteFormatElement - (local->writer, (xmlChar *)"used_space", "%s", - (char *)used); - } else { - ret = xmlTextWriterWriteFormatElement - (local->writer, (xmlChar *)"user_space", "%11"PRIu64, - *(long unsigned int *)used); - } + ret = xmlTextWriterWriteFormatElement (local->writer, + (xmlChar *)"soft_limit_value", + "%"PRIu64, sl_num); XML_RET_CHECK_AND_GOTO (ret, out); - if ((char *)avail) { - ret = xmlTextWriterWriteFormatElement - (local->writer, (xmlChar *)"avail_space", "%s", - (char *)avail); - } else { - ret = xmlTextWriterWriteFormatElement - (local->writer, (xmlChar *)"avail_space", "%11"PRIu64, - *(long unsigned int *)avail); - } + ret = xmlTextWriterWriteFormatElement (local->writer, + (xmlChar *)"used_space", + "%"PRIu64, used); + XML_RET_CHECK_AND_GOTO (ret, out); + + ret = xmlTextWriterWriteFormatElement (local->writer, + (xmlChar *)"avail_space", + "%"PRIu64, avail); XML_RET_CHECK_AND_GOTO (ret, out); ret = xmlTextWriterWriteFormatElement (local->writer, @@ -6254,8 +6247,9 @@ out: int cli_quota_object_xml_output (cli_local_t *local, char *path, char *sl_str, - quota_limits_t *limits, quota_meta_t *used_space, - int64_t avail, char *sl, char *hl) + int64_t sl_val, quota_limits_t *limits, + quota_meta_t *used_space, int64_t avail, + char *sl, char *hl) { #if (HAVE_LIB_XML) int ret = -1; @@ -6274,11 +6268,16 @@ cli_quota_object_xml_output (cli_local_t *local, char *path, char *sl_str, XML_RET_CHECK_AND_GOTO (ret, out); ret = xmlTextWriterWriteFormatElement (local->writer, - (xmlChar *)"soft_limit", + (xmlChar *)"soft_limit_percent", "%s", sl_str); XML_RET_CHECK_AND_GOTO (ret, out); ret = xmlTextWriterWriteFormatElement (local->writer, + (xmlChar *)"soft_limit_value", + "%"PRIu64, sl_val); + XML_RET_CHECK_AND_GOTO (ret, out); + + ret = xmlTextWriterWriteFormatElement (local->writer, (xmlChar *)"file_count", "%"PRIu64, used_space->file_count); |