From 9dc9fb48f1790a76c499b105687cee82b2840865 Mon Sep 17 00:00:00 2001
From: Kaushal M <kaushal@gluster.com>
Date: Mon, 26 Sep 2011 10:33:56 +0530
Subject: glusterd: support for resetting single option

Allows resetting of only single options using 'volume reset' command.
New syntax of volume reset is: 'volume reset [option] [force]'.
Giving "all" as options or not specifying an option, causes all options
to be reset.

Change-Id: Ib9e220f326adeb1be1a774737a0b12c910012cea
BUG: 2980
Reviewed-on: http://review.gluster.com/450
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amar@gluster.com>
---
 cli/src/cli-cmd-parser.c | 27 ++++++++++++++++++++++++---
 cli/src/cli-cmd-volume.c |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'cli')

diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 2b3db193925..6d984680e35 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -406,7 +406,7 @@ cli_cmd_volume_reset_parse (const char **words, int wordcount, dict_t **options)
         if (wordcount < 3)
                 goto out;
 
-        if (wordcount > 4)
+        if (wordcount > 5)
                 goto out;
 
         volname = (char *)words[2];
@@ -420,8 +420,29 @@ cli_cmd_volume_reset_parse (const char **words, int wordcount, dict_t **options)
         if (ret)
                 goto out;
 
-        if (wordcount == 4) {
-                if (strcmp ("force", (char*)words[3])) {
+        if (wordcount == 3) {
+                ret = dict_set_str (dict, "key", "all");
+                if (ret)
+                        goto out;
+        }
+
+        if (wordcount >= 4) {
+                if (!strcmp ("force", (char*)words[3])) {
+                        ret = dict_set_int32 (dict, "force", 1);
+                        if (ret)
+                                goto out;
+                        ret = dict_set_str (dict, "key", "all");
+                        if (ret)
+                                goto out;
+                } else {
+                        ret = dict_set_str (dict, "key", (char *)words[3]);
+                        if (ret)
+                                goto out;
+                }
+        }
+
+        if (wordcount == 5) {
+                if (strcmp ("force", (char*)words[4])) {
                         ret = -1;
                         goto out;
                 } else {
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index a2ec5086317..00077253237 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -1579,7 +1579,7 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_sync_volume_cbk,
          "sync the volume information from a peer"},
 
-         { "volume reset <VOLNAME> [force]",
+         { "volume reset <VOLNAME> [option] [force]",
          cli_cmd_volume_reset_cbk,
          "reset all the reconfigured options"},
 
-- 
cgit