From dbd9bd7b2d806163f9bb069ec04e24d9269f769c Mon Sep 17 00:00:00 2001
From: Meghana Madhusudhan <mmadhusu@redhat.com>
Date: Fri, 10 Apr 2015 19:14:42 +0530
Subject: NFS-Ganesha : Fixing HA script invocation and others

gluster features.ganesha disable failed invariably.
And also, there were problems in unexporting
volumes dynamically.Fixed the above problems.

Change-Id: I29aa289dc8dc7b39fe0fd9d3098a02097ca8ca0c
BUG: 1207629
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
Reviewed-on: http://review.gluster.org/10199
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: NetBSD Build System
---
 extras/ganesha/scripts/create-export-ganesha.sh |  7 ++++---
 extras/ganesha/scripts/dbus-send.sh             | 17 ++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'extras')

diff --git a/extras/ganesha/scripts/create-export-ganesha.sh b/extras/ganesha/scripts/create-export-ganesha.sh
index 8140a11f548..de869c4629d 100755
--- a/extras/ganesha/scripts/create-export-ganesha.sh
+++ b/extras/ganesha/scripts/create-export-ganesha.sh
@@ -36,7 +36,8 @@ echo -e "# WARNING : Using Gluster CLI will overwrite manual
 # and run ganesha-ha.sh --refresh-config."
 
 echo "EXPORT{"
-echo "      Export_Id = 1;"
+echo "      Export_Id = 2;"
+echo "      Path = \"/$VOL\";"
 echo "      FSAL {"
 echo "           name = "GLUSTER";"
 echo "           hostname=\"localhost\";"
@@ -45,8 +46,8 @@ echo "           }"
 echo "      Access_type = RW;"
 echo '      Squash="No_root_squash";'
 echo "      Pseudo=\"/$VOL\";"
-echo '      Protocols = "3,4" ;'
-echo '      Transports = "UDP,TCP";'
+echo '      Protocols = "3", "4" ;'
+echo '      Transports = "UDP","TCP";'
 echo '      SecType = "sys";'
 echo "     }"
 }
diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh
index 406162f0747..170983a7a77 100755
--- a/extras/ganesha/scripts/dbus-send.sh
+++ b/extras/ganesha/scripts/dbus-send.sh
@@ -1,9 +1,11 @@
 #/bin/bash
 
 declare -i EXPORT_ID
-GANESHA_DIR=$1
-OPTION=$1
-VOL=$2
+GANESHA_DIR=${1%/}
+OPTION=$2
+VOL=$3
+
+CONF=$(cat /etc/sysconfig/ganesha | grep "CONFFILE" | cut -f 2 -d "=")
 
 function check_cmd_status()
 {
@@ -38,24 +40,23 @@ function dynamic_export_add()
         sed -i s/Export_Id.*/"Export_Id= $EXPORT_ID ;"/ \
 $GANESHA_DIR/exports/export.$VOL.conf
         check_cmd_status `echo $?`
-        dbus-send --print-reply --system \
+        dbus-send  --system \
 --dest=org.ganesha.nfsd  /org/ganesha/nfsd/ExportMgr \
 org.ganesha.nfsd.exportmgr.AddExport  string:$GANESHA_DIR/exports/export.$VOL.conf \
 string:"EXPORT(Path=/$VOL)"
-
 }
 
 #This function removes an export dynamically(uses the export_id of the export)
 function dynamic_export_remove()
 {
         removed_id=`cat $GANESHA_DIR/exports/export.$VOL.conf |\
-grep Export_Id | cut -d " " -f3`
-        echo $removed_id
+grep Export_Id | cut -d " " -f8`
         check_cmd_status `echo $?`
         dbus-send --print-reply --system \
 --dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \
 org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id
         check_cmd_status `echo $?`
+        sed -i /$VOL.conf/d $CONF
         rm -rf $GANESHA_DIR/exports/export.$VOL.conf
 
 }
@@ -63,12 +64,10 @@ org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id
 if [ "$OPTION" = "on" ];
 then
         dynamic_export_add $@
-        check_cmd_status `echo $?`
 fi
 
 if [ "$OPTION" = "off" ];
 then
         dynamic_export_remove $@
-        check_cmd_status `echo $?`
 fi
 
-- 
cgit