diff options
| author | Jiffin Tony Thottan <jthottan@gmail.com> | 2016-01-22 17:47:07 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-03-01 00:00:04 -0800 |
| commit | ea00992d3d52a51b7c8311ad9565bbbb6e395f9d (patch) | |
| tree | 5f1ba7aecc99f3a0413c6891ff349861304a5cdc /extras/ganesha/scripts/dbus-send.sh | |
| parent | 487b3a65d3cebefac93a30222eb81b0a7465c778 (diff) | |
NFS-Ganesha : scripts related changes for supporting multiple export entires for volume
Previously script such as dbus-send.sh, ganesha-ha.sh can handle only one EXPORT{} block.
Change-Id: I2286af4877f96f4334435818f67beea87efa2b1f
BUG: 1275966
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: http://review.gluster.org/13283
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'extras/ganesha/scripts/dbus-send.sh')
| -rwxr-xr-x | extras/ganesha/scripts/dbus-send.sh | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh index 4840be830d6..5f268eb37c2 100755 --- a/extras/ganesha/scripts/dbus-send.sh +++ b/extras/ganesha/scripts/dbus-send.sh @@ -63,30 +63,37 @@ function dynamic_export_add() EXPORT_ID=`cat $GANESHA_DIR/.export_added` check_cmd_status `echo $?` - 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 + check_cmd_status `echo $?` + 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 check_cmd_status `echo $?` - sed -i s/Export_Id.*/"Export_Id= $EXPORT_ID ;"/ \ -$GANESHA_DIR/exports/export.$VOL.conf - check_cmd_status `echo $?` - 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 " " -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 $?` + grep Export_Id $GANESHA_DIR/exports/export.$VOL.conf | \ + while read entry; + do + dbus-send --print-reply --system \ + --dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \ + org.ganesha.nfsd.exportmgr.RemoveExport \ + uint16:$(echo $entry | awk -F"[=,;]" '{print$2}') + check_cmd_status `echo $?` + done sed -i /$VOL.conf/d $CONF rm -rf $GANESHA_DIR/exports/export.$VOL.conf |