summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2018-05-03 00:58:02 +0200
committerAmar Tumballi <amarts@redhat.com>2018-05-04 04:49:43 +0000
commitaf132df34c6e7d74af0947ce3ef391546907f028 (patch)
tree9225c678ad076b415e0deacb2259e6e4088b14ef
parentc63b278947dbc134e08331a097cf2041cf98c545 (diff)
cli/snapshot: ignore errors for snapshot status for ALL/VOL
Currently errors are reported for snapshot status of type ALL and VOL. The intention was to ignore those, but the code gets it wrong. The original condition for ignoring ALL/VOL was removed in Bug 1096610 Change-Id Ifc0ac31d2a9f91e136e87f3b51a629df7dba94e8 And the current logic introduced in Bug 789278 Change-Id I985cea1ef787d239b2632d5a7f467070846f92e4 Change-Id: Ic02ea98fb23b1149264e91b41f2fc2ca916d405f Fixes: bz#1574259 Signed-off-by: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
-rw-r--r--cli/src/cli-rpc-ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index c347c5c13e6..ce5236bc708 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -11453,7 +11453,7 @@ gf_cli_snapshot_for_status (call_frame_t *frame, xlator_t *this,
* not be appropriate.
*/
if (ret &&
- (cmd != GF_SNAP_STATUS_TYPE_ALL ||
+ (cmd != GF_SNAP_STATUS_TYPE_ALL &&
cmd != GF_SNAP_STATUS_TYPE_VOL)) {
gf_log ("cli", GF_LOG_ERROR,
"cli_to_glusterd for snapshot status failed");