From 572f5f0a85c97a4f90a33be87b96368a0d7e7a8e Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Wed, 10 Jul 2013 18:10:49 +0530 Subject: cli,glusterd: Fix when tasks are shown in 'volume status' Asynchronous tasks are shown in 'volume status' only for a normal volume status request for either all volumes or a single volume. Change-Id: I9d47101511776a179d213598782ca0bbdf32b8c2 BUG: 888752 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.org/5308 Reviewed-by: Amar Tumballi Tested-by: Gluster Build System Reviewed-by: Anand Avati --- cli/src/cli-xml-output.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cli') diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index a2bd2b141..680270550 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -1578,7 +1578,11 @@ cli_xml_output_vol_status (cli_local_t *local, dict_t *dict) XML_RET_CHECK_AND_GOTO (ret, out); } - if ((cmd & GF_CLI_STATUS_MASK) == GF_CLI_STATUS_NONE) { + /* Tasks are only present when a normal volume status call is done on a + * single volume or on all volumes + */ + if (((cmd & GF_CLI_STATUS_MASK) == GF_CLI_STATUS_NONE) && + (cmd & (GF_CLI_STATUS_VOL|GF_CLI_STATUS_ALL))) { ret = cli_xml_output_vol_status_tasks (local, dict); if (ret) goto out; -- cgit