diff options
| author | hari gowtham <hgowtham@redhat.com> | 2015-11-23 11:58:52 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-26 05:29:41 -0800 |
| commit | 7d95955cd2b2b8979e66bcf09e792a34a12bd8a3 (patch) | |
| tree | 3fc41f2fe47bb2a1362b7a6f8b37e6f3558e1575 | |
| parent | 789803ce16409a1f9ce84c0f9a60e68bd630380e (diff) | |
Tiering: change of error message for "v tier <vname> detach status"
If the volume was not a tiered volume then empty status was being
printed instead of an error message.
Change-Id: I13ccb16e1562966976a48d9365ced4c8a124de59
BUG: 1284357
Signed-off-by: hari gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/12713
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 813006e54f5..e841b25f60d 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -2396,10 +2396,10 @@ gf_cli_detach_tier_status_cbk (struct rpc_req *req, struct iovec *iov, ret = rsp.op_ret; if (rsp.op_ret == -1) { if (strcmp (rsp.op_errstr, "")) - snprintf (msg, sizeof (msg), "volume detach-tier %s: " + snprintf (msg, sizeof (msg), "volume tier detach %s: " "failed: %s", cmd_str, rsp.op_errstr); else - snprintf (msg, sizeof (msg), "volume detach-tier %s: " + snprintf (msg, sizeof (msg), "volume tier detach %s: " "failed", cmd_str); if (global_state->mode & GLUSTER_MODE_XML) diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 25349506f58..bb477a7c9f2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -735,6 +735,14 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr) goto out; } } + if (strstr(cmd_str, "tier") != NULL) { + if (volinfo->type != GF_CLUSTER_TYPE_TIER) { + snprintf (msg, sizeof(msg), "volume %s is not " + "a tier volume.", volinfo->volname); + ret = -1; + goto out; + } + } if (strstr(cmd_str, "detach-tier") != NULL) { if (volinfo->type != GF_CLUSTER_TYPE_TIER) { snprintf (msg, sizeof(msg), "volume %s is not " |