diff options
| author | jiffin tony Thottan <jthottan@redhat.com> | 2016-03-10 04:03:19 -0800 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-04-24 16:29:47 +0200 |
| commit | 62027360a695ff499c0492f1bc37f585ed4576c1 (patch) | |
| tree | eacad838c551223b6db66317c7d368d6fb34c7e8 /extras/hook-scripts/start/post | |
| parent | 3c04a91f5245708d0a148bf01cfdac1d0d59c797 (diff) | |
Revert "NFS-Ganesha : scripts related changes for supporting multiple export entires for volume"
This reverts change-id I2286af4877f96f4334435818f67beea87efa2b1f.
While testing, I had found that ganesha-ha.sh is not working as expected. It is
almost equivalent to rewrite entire thing again
Change-Id: Ia85e50fe8e043e8a2bc6441b7c45dcc726b36672
BUG: 1275966
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: http://review.gluster.org/13673
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras/hook-scripts/start/post')
| -rwxr-xr-x | extras/hook-scripts/start/post/S31ganesha-start.sh | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh index 513402eaa16..b85c789b9ed 100755 --- a/extras/hook-scripts/start/post/S31ganesha-start.sh +++ b/extras/hook-scripts/start/post/S31ganesha-start.sh @@ -75,30 +75,32 @@ function export_add() # else EXPORT_ID=`cat $GANESHA_DIR/.export_added` + EXPORT_ID=EXPORT_ID+1 #fi fi - for entry in `grep -n Export_Id $GANESHA_DIR/exports/export.$VOL.conf \ - | awk -F":" '{print$1}'` - do - sed -e "$entry s/Export_Id.*/Export_Id=$EXPORT_ID ;/" -i \ - $GANESHA_DIR/exports/export.$VOL.conf - 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(Export_Id=$EXPORT_ID)" - EXPORT_ID=EXPORT_ID+1 - done echo $EXPORT_ID > $GANESHA_DIR/.export_added + sed -i s/Export_Id.*/"Export_Id= $EXPORT_ID ;"/ \ +$GANESHA_DIR/exports/export.$VOL.conf echo "%include \"$GANESHA_DIR/exports/export.$VOL.conf\"" >> $CONF1 } +#This function adds a new export dynamically by sending dbus signals +function dynamic_export_add() +{ + dbus-send --print-reply --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)" + +} + function start_ganesha() { #Remove export entry from nfs-ganesha.conf sed -i /$VOL.conf/d $CONF1 #Create a new export entry export_add $VOL + dynamic_export_add $VOL + } # based on src/scripts/ganeshactl/Ganesha/export_mgr.py |