From c976b59bc4c34ed26bc3f5d9b78356600d8f1d47 Mon Sep 17 00:00:00 2001 From: Meghana Madhusudhan Date: Fri, 17 Apr 2015 10:56:57 +0530 Subject: 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 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: I9084d004c0aaf960f59ed8aa2d7f1c9309924658 BUG: 1217793 Signed-off-by: Meghana Madhusudhan Reviewed-on: http://review.gluster.org/10489 Reviewed-by: Kaleb KEITHLEY Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- xlators/features/ganesha/src/ganesha.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'xlators/features/ganesha/src') diff --git a/xlators/features/ganesha/src/ganesha.c b/xlators/features/ganesha/src/ganesha.c index a3d392e3ecf..fe9f14864b1 100644 --- a/xlators/features/ganesha/src/ganesha.c +++ b/xlators/features/ganesha/src/ganesha.c @@ -84,13 +84,7 @@ struct xlator_cbks cbks = { }; struct volume_options options[] = { - { - .key = {"features.ganesha"}, - .default_value = "disable", - .type = GF_OPTION_TYPE_BOOL, - .description = "enable translator" - }, { .key = {"ganesha.enable"}, .default_value = "off", .type = GF_OPTION_TYPE_BOOL, -- cgit