NFS-Ganesha: Handling CLI commands when NFS-Ganesha keys are set

When ganesha.enable is set to on and features.ganesha is
enabled, there are a few behaviour changes that should
be seen in other volume operations.

1. ganesha.enable can be set to 'on' only
when features.ganesha is set to 'enable'

2.When gluster vol is started, and if ganesha.enable
key was set to 'on', it should automatically export the volume
via NFS-Ganesha.

3.When ganesha.enable is set to 'on', and a volume
is stopped, that volume should be unexported via NFS-Ganesha.

4. gluster vol reset <volname>
If ganesha.enable was set to on, then unexport the
volume via NFS-Ganesha.

5. gluster vol reset all
If features.ganesha is set to enable, as part
of reset all, set it to disable. This translates
to teardown cluster.

All the above problems are fixed by checking the global key
and value, depending on the value, specific functions are called.
And also, functions related to global commands
are moved to cli-cmd-global.c

Commit phase of features.ganesha enable/disable
runs the ganesha-ha.sh setup/teardown respectively.
Before the script begins, it is important that the
NFS-Ganesha service starts on all the HA nodes.
Having the start service commands in the
commit phase could lead to problems.
Moving the pre-requisite service start
commands to the 'stage' phase.

Change-Id: I5a256f94f8e1310ddcd5369f329b7168b2a24c47
BUG: 1200265
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
Reviewed-on: http://review.gluster.org/10283
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index bb0af2fc38..b30306b258 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -819,7 +819,7 @@ out:
 }
 
 /* Parsing global option for NFS-Ganesha config
- *  gluster features.ganesha enable/disable */
+ *  gluster nfs-ganesha enable/disable */
 
 int32_t
 cli_cmd_ganesha_parse (struct cli_state *state,
@@ -833,7 +833,7 @@ cli_cmd_ganesha_parse (struct cli_state *state,
         char    *value    =       NULL;
         int     i         =       0;
         char    *w        =       NULL;
-        char   *opwords[] =      { "enable", "disable" };
+        char   *opwords[] =      { "enable", "disable", NULL };
         const char      *question       =       NULL;
         gf_answer_t     answer          =       GF_ANSWER_NO;
 
@@ -853,7 +853,7 @@ cli_cmd_ganesha_parse (struct cli_state *state,
         value = (char *) words[1];
 
         if (!key || !value) {
-                cli_out ("Usage : features.ganesha <enable/disable>");
+                cli_out ("Usage : nfs-ganesha <enable/disable>");
                 ret = -1;
                 goto out;
         }
@@ -862,7 +862,7 @@ cli_cmd_ganesha_parse (struct cli_state *state,
         if (ret == -1)
                 goto out;
 
-        if (strcmp (key, "features.ganesha")) {
+        if (strcmp (key, "nfs-ganesha")) {
                 gf_asprintf (op_errstr, "Global option: error: ' %s '"
                           "is not a valid global option.", key);
                 ret = -1;
@@ -872,13 +872,13 @@ cli_cmd_ganesha_parse (struct cli_state *state,
         w = str_getunamb (value, opwords);
         if (!w) {
                 cli_out ("Invalid global option \n"
-                         "Usage : features.ganesha <enable/disable>");
+                         "Usage : nfs-ganesha <enable/disable>");
                 ret = -1;
                 goto out;
         }
 
         question = "Enabling NFS-Ganesha requires Gluster-NFS to be"
-                   "disabled across the trusted pool. Do you "
+                   " disabled across the trusted pool. Do you "
                    "still want to continue?";
 
         if (strcmp (value, "enable") == 0) {