mgmt/glusterd: volume start force

Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1736 (implement volume start force)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1736

3 files changed, 28 insertions, 16 deletions

diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index c7a027a18..8d846d873 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -44,7 +44,7 @@ cli_cmd_volume_help_cbk (struct cli_state *state, struct cli_cmd_word *in_word,
 void
 cli_cmd_volume_start_usage ()
 {
-        cli_out ("Usage: volume start <VOLNAME>");
+        cli_out ("Usage: volume start <VOLNAME> [force]");
 }
 
 void
@@ -71,11 +71,12 @@ cli_cmd_volume_info_usage ()
         cli_out ("Usage: volume info [all|<VOLNAME>]");
 }
 
-void 
+void
 cli_cmd_volume_set_usage ()
 {
 	cli_out ("Usage: volume set <VOLNAME> <KEY> <VALUE>");
 }
+
 int
 cli_cmd_volume_info_cbk (struct cli_state *state, struct cli_cmd_word *word,
                          const char **words, int wordcount)
@@ -252,7 +253,6 @@ out:
         return ret;
 }
 
-
 int
 cli_cmd_volume_start_cbk (struct cli_state *state, struct cli_cmd_word *word,
                           const char **words, int wordcount)
@@ -260,29 +260,40 @@ cli_cmd_volume_start_cbk (struct cli_state *state, struct cli_cmd_word *word,
         int                     ret = -1;
         rpc_clnt_procedure_t    *proc = NULL;
         call_frame_t            *frame = NULL;
-        char                    *volname = NULL;
-
+        gf1_cli_start_vol_req    req = {0,};
 
         frame = create_frame (THIS, THIS->ctx->pool);
         if (!frame)
                 goto out;
 
-        if (wordcount != 3) {
+        if (wordcount < 3 || wordcount > 4) {
                cli_cmd_volume_start_usage ();
                goto out;
         }
 
-        volname = (char *)words[2];
+        req.volname = (char *)words[2];
+        if (!req.volname)
+                goto out;
+
+        if (wordcount == 4) {
+                if (!strcmp("force", words[3])) {
+                        req.flags |= GF_CLI_FLAG_OP_FORCE;
+                } else {
+                        ret = -1;
+                        cli_cmd_volume_start_usage ();
+                        goto out;
+                }
+        }
 
         proc = &cli_rpc_prog->proctable[GF1_CLI_START_VOLUME];
 
         if (proc->fn) {
-                ret = proc->fn (frame, THIS, volname);
+                ret = proc->fn (frame, THIS, &req);
         }
 
 out:
-        if (!proc && ret && volname)
-                cli_out ("Starting Volume %s failed", volname);
+        if (!proc && ret && req.volname)
+                cli_out ("Starting Volume %s failed", req.volname);
 
         return ret;
 }
@@ -812,7 +823,7 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_volume_delete_cbk,
           "delete volume specified by <VOLNAME>"},
 
-        { "volume start <VOLNAME>",
+        { "volume start <VOLNAME> [force]",
           cli_cmd_volume_start_cbk,
           "start volume specified by <VOLNAME>"},
 
diff --git a/cli/src/cli.h b/cli/src/cli.h
index b8aa985b8..216b743fd 100644
--- a/cli/src/cli.h
+++ b/cli/src/cli.h
@@ -111,6 +111,7 @@ struct cli_local {
 
                 struct {
                         char    *volname;
+                        int     flags;
                 } start_vol;
 
                 struct {
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index 0984a7936..2c64f115e 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -1409,7 +1409,7 @@ int32_t
 gf_cli3_1_start_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf1_cli_start_vol_req   req = {0,};
+        gf1_cli_start_vol_req   *req = NULL;
         int                     ret = 0;
         cli_local_t             *local = NULL;
 
@@ -1418,16 +1418,16 @@ gf_cli3_1_start_volume (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
+        req = data;
         local = cli_local_get ();
 
         if (local) {
-                local->u.start_vol.volname = data;
+                local->u.start_vol.volname = req->volname;
+                local->u.start_vol.flags = req->flags;
                 frame->local = local;
         }
 
-        req.volname = data;
-
-        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+        ret = cli_cmd_submit (req, frame, cli_rpc_prog,
                               GD_MGMT_CLI_START_VOLUME, NULL,
                               gf_xdr_from_cli_start_vol_req,
                               this, gf_cli3_1_start_volume_cbk);