summaryrefslogtreecommitdiffstats
path: root/extras/hook-scripts
diff options
context:
space:
mode:
authorMeghana M <mmadhusu@redhat.com>2015-06-30 23:47:39 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-07-02 04:38:48 -0700
commit8def0f28c908224359a04ec2f658a3ba241c7249 (patch)
tree2473b85dba799c6db9f7440e208b9786902f2ce1 /extras/hook-scripts
parent4242857196697d3fcfc0c7a75ede4a666518ea0b (diff)
NFS-Ganesha : Unexport fails after S31ganesha-start script is run
The dbus-send script extracts the export ID from the export config file. It expects the export ID to be written in a particular format. The post-phase hook-script created the export file in a different format,and the dbus-send never gets the correct export ID because of this. Fixing the issue by replacing the write_conf function in the S31ganesha-start hook-script.Also, NFS-Ganesha service stops when dbus signal is sent more than once on the same export. Consecutive start/stop operations creates problems. Fixing all the issues at once. Change-Id: Ibf639eb3556b1e51dd8dcb0c784a6a7f07badb97 BUG: 1238054 Signed-off-by: Meghana M <mmadhusu@redhat.com> Reviewed-on: http://review.gluster.org/11477 Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras/hook-scripts')
-rwxr-xr-xextras/hook-scripts/start/post/S31ganesha-start.sh46
1 files changed, 27 insertions, 19 deletions
diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh
index f1ca72b38d2..a657b00055f 100755
--- a/extras/hook-scripts/start/post/S31ganesha-start.sh
+++ b/extras/hook-scripts/start/post/S31ganesha-start.sh
@@ -37,24 +37,27 @@ function parse_args ()
#This function generates a new export entry as export.volume_name.conf
function write_conf()
{
- echo "EXPORT{
- "
- echo "Export_Id = ;"
- echo "Path=\"/$1\";"
- echo "FSAL {
- "
- echo "name = "GLUSTER";"
- echo "hostname="localhost";"
- echo "volume=\"$1\";"
- echo "}"
- echo "Access_type = RW;"
- echo "Squash = No_root_squash;"
- echo "Disable_ACL = TRUE;"
- echo "Pseudo=\"/$1\";"
- echo "Protocols = \"3\",\"4\" ;"
- echo "Transports = \"UDP\",\"TCP\" ;"
- echo "SecType = \"sys\";"
- echo "}"
+echo -e "# WARNING : Using Gluster CLI will overwrite manual
+# changes made to this file. To avoid it, edit the
+# file, copy it over to all the NFS-Ganesha nodes
+# and run ganesha-ha.sh --refresh-config."
+
+echo "EXPORT{"
+echo " Export_Id = 2;"
+echo " Path = \"/$VOL\";"
+echo " FSAL {"
+echo " name = \"GLUSTER\";"
+echo " hostname=\"localhost\";"
+echo " volume=\"$VOL\";"
+echo " }"
+echo " Access_type = RW;"
+echo " Disable_ACL = true;"
+echo " Squash=\"No_root_squash\";"
+echo " Pseudo=\"/$VOL\";"
+echo " Protocols = \"3\", \"4\" ;"
+echo " Transports = \"UDP\",\"TCP\";"
+echo " SecType = \"sys\";"
+echo "}"
}
#This function keeps track of export IDs and increments it with every new entry
@@ -101,9 +104,14 @@ function start_ganesha()
}
parse_args $@
+ is_exported="no"
+ if showmount -e localhost | cut -d "" -f1 | grep -q "/$VOL[[:space:]]"
+ then
+ is_exported="yes"
+ fi
ganesha_value=$(grep $ganesha_key $GLUSTERD_WORKDIR/vols/$VOL/info |\
cut -d"=" -f2)
- if [ "$ganesha_value" = "on" ]
+ if [ "$ganesha_value" = "on" -a "$is_exported" = "no" ]
then
write_conf $VOL > $GANESHA_DIR/exports/export.$VOL.conf
start_ganesha $VOL