From beeb30a4b777c5bbd6ebfd8f2074b99f30122e08 Mon Sep 17 00:00:00 2001 From: Rajesh Joseph Date: Fri, 20 Jun 2014 18:04:33 +0530 Subject: glusterd/snapshot: cli error message corrected snapshot delete on failure used to give invalid error message. Change-Id: I65d6edf8004c9a1bb91f28fa987b2d1629134013 BUG: 1111603 Signed-off-by: Rajesh Joseph Reviewed-on: http://review.gluster.org/8137 Reviewed-by: Atin Mukherjee Tested-by: Gluster Build System Reviewed-by: Sachin Pandit Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi --- cli/src/cli-rpc-ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cli') diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 26b6152f2be..c4846be2379 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -7648,16 +7648,17 @@ cli_snapshot_remove_reply (gf_cli_rsp *rsp, dict_t *dict) GF_ASSERT (rsp); GF_ASSERT (dict); - ret = dict_get_str (dict, "snapname", &snap_name); - if (ret) { - gf_log ("cli", GF_LOG_ERROR, "Failed to get snapname"); + if (rsp->op_ret) { + cli_err ("snapshot delete: failed: %s", + rsp->op_errstr ? rsp->op_errstr : + "Please check log file for details"); + ret = rsp->op_ret; goto out; } - if (rsp->op_ret) { - cli_err("snapshot delete: failed: snap %s " - "might not be in an usable state.", snap_name); - ret = rsp->op_ret; + ret = dict_get_str (dict, "snapname", &snap_name); + if (ret) { + gf_log ("cli", GF_LOG_ERROR, "Failed to get snapname"); goto out; } -- cgit