From bf6a71bcb08357766027e9318edae4b8298c339c Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Thu, 4 Jun 2015 14:14:14 +0530 Subject: glusterd/tier: glusterd crashed with detach-tier commit force glusterd crashed when doing "detach-tier commit force" on a non-tiered volume. >Change-Id: I884771893bb80bec46ae8642c2cfd7e54ab116a6 >BUG: 1228112 >Signed-off-by: Mohammed Rafi KC >Reviewed-on: http://review.gluster.org/11081 >Tested-by: Gluster Build System >Tested-by: NetBSD Build System >Reviewed-by: Joseph Fernandes >Reviewed-by: Dan Lambright >Reviewed-by: Krishnan Parthasarathi (cherry picked from commit fefc8730e2a87db41d5f79c9853a14cab86715e5) Change-Id: Ia536da3ec4c632d7d1cc1575dd2b7b098a2c7aec BUG: 1230563 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/11174 Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Joseph Fernandes Tested-by: Joseph Fernandes --- cli/src/cli-rpc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cli') diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 290028f6510..a834147bb62 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1784,7 +1784,7 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov, rsp.op_errstr); } } - if (cmd == GF_DEFRAG_CMD_STATUS) { + if (cmd == GF_DEFRAG_CMD_STATUS || cmd == GF_DEFRAG_CMD_STATUS_TIER) { if (rsp.op_ret == -1) { if (strcmp (rsp.op_errstr, "")) snprintf (msg, sizeof (msg), -- cgit