From 563cafb5a5e742fc7fd2c175b332f0000c053040 Mon Sep 17 00:00:00 2001 From: hari gowtham Date: Tue, 24 Jan 2017 14:24:47 +0530 Subject: CLI/TIER: removing old tier commands under rebalance PROBLEM: gluster v rebalance tier start works even after the switch of tier to service framework. This lets the user have two tierd for the same volume. FIX: checking for each process will make the new code hard to maintain. So we are removing the support for old commands. Change-Id: I5b0974b2dbb74f0bee8344b61c7f924300ad73f2 BUG: 1415590 Signed-off-by: hari gowtham Reviewed-on: https://review.gluster.org/16463 Smoke: Gluster Build System Tested-by: hari gowtham NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: N Balachandran Reviewed-by: Atin Mukherjee --- cli/src/cli-rpc-ops.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'cli/src/cli-rpc-ops.c') diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 7cdbaf0cad9..879c6c40aa1 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -4911,10 +4911,9 @@ gf_cli_attach_tier (call_frame_t *frame, xlator_t *this, int ret = 0; dict_t *dict = NULL; dict_t *newdict = NULL; - char *tierwords[] = {"volume", "rebalance", "", - "tier", "start", NULL}; + char *tierwords[] = {"volume", "tier", "", + "start", NULL}; const char **words = (const char **)tierwords; - int wordcount = 5; char *volname = NULL; cli_local_t *local = NULL; cli_local_t *oldlocal = NULL; @@ -4942,8 +4941,8 @@ gf_cli_attach_tier (call_frame_t *frame, xlator_t *this, } words[2] = volname; - ret = cli_cmd_volume_defrag_parse ((const char **)words, - wordcount, &newdict); + ret = cli_cmd_volume_old_tier_parse ((const char **)words, + 4, &newdict); if (ret) { gf_log ("cli", GF_LOG_ERROR, "Failed to parse tier start " "command"); @@ -4962,8 +4961,7 @@ notify_cli: if (ret) { cli_out ("Failed to run tier start. Please execute tier start " "command explicitly"); - cli_out ("Usage : gluster volume rebalance tier " - "start"); + cli_out ("Usage : gluster volume tier start"); } out: -- cgit