summaryrefslogtreecommitdiffstats
path: root/cli/src/cli-cmd-volume.c
diff options
context:
space:
mode:
authorDan Lambright <dlambrig@redhat.com>2015-04-13 02:42:12 +0100
committerVijay Bellur <vbellur@redhat.com>2015-05-09 08:35:14 -0700
commit99b778cbe179104af602b6eedebd31695bec16ae (patch)
tree5352721732f773b117b4a1c771577cedfaf329f4 /cli/src/cli-cmd-volume.c
parent5fd6b3b7e2881d21a1b19fb22366e905314d71bc (diff)
glusterd: support for tier volumes 'detach start' and 'detach commit'
Back port of http://review.gluster.org/10108 These commands work in a manner analagous to rebalancing when removing a brick. The existing migration daemon detects "detach start" and switches to moving data off the hot tier. While in this state all lookups are directed to the cold tier. gluster v detach-tier <vol> start gluster v detach-tier <vol> commit The status and stop cli commands shall be submitted separately. >Change-Id: I24fda5cc3ba74f5fb8aa9a3234ad51f18b80a8a0 >BUG: 1205540 >Signed-off-by: Dan Lambright <dlambrig@redhat.com> >Signed-off-by: root <root@localhost.localdomain> >Signed-off-by: Dan Lambright <dlambrig@redhat.com> >Reviewed-on: http://review.gluster.org/10108 >Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Change-Id: I212d748d077fb5870ee84b316c653acbafbea3f7 BUG: 1220047 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/10708 Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'cli/src/cli-cmd-volume.c')
-rw-r--r--cli/src/cli-cmd-volume.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index f9d4041f3ca..91b2a1988d9 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -924,26 +924,16 @@ cli_cmd_volume_detach_tier_cbk (struct cli_state *state,
const char *question = "Removing tier can result in data loss. "
"Do you want to Continue?";
- if (wordcount != 3)
- goto out;
-
frame = create_frame (THIS, THIS->ctx->pool);
if (!frame)
goto out;
- options = dict_new ();
- if (!options)
- goto out;
+ ret = cli_cmd_volume_detach_tier_parse(words, wordcount, &options);
- ret = dict_set_int32 (options, "force", 1);
if (ret)
goto out;
- ret = dict_set_int32 (options, "command", GF_OP_CMD_DETACH);
- if (ret)
- goto out;
-
- ret = dict_set_str (options, "volname", (char *)words[2]);
+ ret = dict_set_int32 (options, "force", 1);
if (ret)
goto out;
@@ -2523,7 +2513,8 @@ struct cli_cmd volume_cmds[] = {
cli_cmd_volume_attach_tier_cbk,
"attach tier to volume <VOLNAME>"},
- { "volume detach-tier <VOLNAME>",
+ { "volume detach-tier <VOLNAME> "
+ " <start|stop|status|commit|[force]>",
cli_cmd_volume_detach_tier_cbk,
"detach tier from volume <VOLNAME>"},