summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volume-set.c
diff options
context:
space:
mode:
authorMeghana Madhusudhan <mmadhusu@redhat.com>2015-02-02 16:23:22 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-03-18 04:33:13 -0700
commit38ccaaf9d1a93c4fc6d733ee3bd5c73e5457bdab (patch)
tree8856e8a6a869d6a0f1444c74e6bd05b08d950940 /xlators/mgmt/glusterd/src/glusterd-volume-set.c
parent8a9c909702f4f6836bd1d0c791a7b1ae79d4ba15 (diff)
CLI : GLobal option for NFS-Ganesha
A new global CLI option has been introduced for NFS-Ganesha. gluster features.ganesha enable/disable. This option is persistent and shall be inherited by new volumes created after this option is set. gluster features.ganesha enable It carries out the following functions: 1. Disables gluster-nfs across the cluster 2. Starts NFS-Ganesha server on a subset of nodes and exports '/'. 3. Creates the HA cluster for NFS-Ganesha. 4. Writes the option into the global config file. gluster features.ganesha disable 1. Stops NFS-Ganesha server. 2. Tears down the HA cluster for NFS-Ganesha With this change the older volume set options with keys "nfs-ganesha.host" and "nfs-ganesha.enable" will no longer be supported. This commit has only has the CLI related changes. Another patch will be submitted to support this feature entirely. Change-Id: Ie4b66a16c23b33b795738654b9a68f8e2c34efe3 BUG: 1188184 Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com> Reviewed-on: http://review.gluster.org/9538 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-set.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 4d9dce47a13..467d8cb8518 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1444,16 +1444,6 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.option = "!nfs-disable",
.op_version = 1
},
- { .key = "nfs-ganesha.enable",
- .voltype = "nfs/server",
- .option = "!nfs-ganesha.enable",
- .op_version = GD_OP_VERSION_3_6_0,
- },
- { .key = "nfs-ganesha.host",
- .voltype = "nfs/server",
- .option = "!nfs-ganesha.host",
- .op_version = GD_OP_VERSION_3_6_0,
- },
{ .key = "nfs.nlm",
.voltype = "nfs/server",
.option = "nfs.nlm",
@@ -1718,6 +1708,18 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = GD_OP_VERSION_3_7_0,
.flags = OPT_FLAG_CLIENT_OPT
},
+ { .key = "features.ganesha",
+ .voltype = "features/ganesha",
+ .option = "!ganesha",
+ .type = GLOBAL_NO_DOC,
+ .op_version = GD_OP_VERSION_3_7_0,
+ },
+ { .key = "ganesha.enable",
+ .voltype = "features/ganesha",
+ .type = NO_DOC,
+ .op_version = GD_OP_VERSION_3_7_0,
+ },
+
{ .key = NULL
}
};