diff options
author | Meghana M <mmadhusu@redhat.com> | 2015-06-19 05:48:05 +0530 |
---|---|---|
committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2015-06-24 18:08:39 -0700 |
commit | 3e9bc0b4a00e006410521a78011a8feae0af9234 (patch) | |
tree | 13c3d4e1e0dcb745bf176e4e00a333ebc09f5ef0 | |
parent | b1ee65194c7e5c982235b8f3e00e0efb25cf353a (diff) |
NFS-Ganesha : Implement refresh-config
It is important that we give an automatic way of refreshing the config
when the user has changed the export file manually.
Without this, the user will be forced to restart the server.
Implementing refresh_config by using dbus signals to unexport
and export the same export dynamically.
Making a few changes to make sure that "--help"
doesn't throw unnecessary error messages.
This is the backport of the patch merged on master,
http://review.gluster.org/#/c/11331/
Change-Id: I2e17edeffc191e2cc30a328b2999e1a04f5bc498
BUG: 1235258
Signed-off-by: Meghana M <mmadhusu@redhat.com>
Reviewed-on: http://review.gluster.org/11380
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rwxr-xr-x | extras/ganesha/scripts/dbus-send.sh | 8 | ||||
-rwxr-xr-x | extras/ganesha/scripts/ganesha-ha.sh | 96 |
2 files changed, 89 insertions, 15 deletions
diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh index 170983a7a77..b96bba90e45 100755 --- a/extras/ganesha/scripts/dbus-send.sh +++ b/extras/ganesha/scripts/dbus-send.sh @@ -4,14 +4,16 @@ declare -i EXPORT_ID GANESHA_DIR=${1%/} OPTION=$2 VOL=$3 - -CONF=$(cat /etc/sysconfig/ganesha | grep "CONFFILE" | cut -f 2 -d "=") +cfgline=$(grep ^CONFFILE= /etc/sysconfig/ganesha) +eval $(echo ${cfgline} | grep -F CONFFILE=) +CONF=${CONFFILE:-/etc/ganesha/ganesha.conf} function check_cmd_status() { if [ "$1" != "0" ] then rm -rf $GANESHA_DIR/exports/export.$VOL.conf + sed -i /$VOL.conf/d $CONF exit 1 fi } @@ -20,7 +22,7 @@ function check_cmd_status() function dynamic_export_add() { count=`ls -l $GANESHA_DIR/exports/*.conf | wc -l` - if [ "$count" = "1" ] ; + if [ "$count" = "0" ] ; then EXPORT_ID=2 else diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 74c1194198c..3fa09bd8640 100755 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -32,6 +32,17 @@ GANESHA_CONF=${CONFFILE:-/etc/ganesha/ganesha.conf} RHEL6_PCS_CNAME_OPTION="--name" +usage() { + + echo "Usage : add|delete|status" + echo "Add-node : ganesha-ha.sh --add <HA_CONF_DIR> \ +<NODE-HOSTNAME> <NODE-VIP>" + echo "Delete-node: ganesha-ha.sh --delete <HA_CONF_DIR> \ +<NODE-HOSTNAME>" + echo "Refresh-config : ganesha-ha.sh --refresh-config <HA_CONFDIR>\ + <volume>" +} + determine_service_manager () { if [ -e "/usr/bin/systemctl" ]; @@ -171,12 +182,17 @@ setup_finalize() setup_copy_config() { local short_host=$(hostname -s) + local tganesha_conf=$(mktemp -u) if [ -e /var/lib/glusterd/nfs/secret.pem ]; then while [[ ${1} ]]; do - if [ ${short_host} != ${1} ]; then + current_host=`echo ${1} | cut -d "." -f 1` + if [ ${short_host} != ${current_host} ]; then + cp ${HA_CONFDIR}/ganesha-ha.conf ${tganesha_conf} scp -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ -/var/lib/glusterd/nfs/secret.pem ${1}:${HA_CONFDIR}/ganesha-ha.conf ${1}:${HA_CONFDIR}/ +/var/lib/glusterd/nfs/secret.pem ${short_host}:${tganesha_conf}\ + ${1}:${HA_CONFDIR}/ganesha-ha.conf + rm -rf ${tganesha_conf} if [ $? -ne 0 ]; then logger "warning: scp ganesha-ha.conf to ${1} failed" fi @@ -188,6 +204,56 @@ setup_copy_config() fi } +refresh_config () +{ + local short_host=$(hostname -s) + local VOL=${1} + local HA_CONFDIR=${2} + local tganesha_export=$(mktemp -u) + + removed_id=`cat $HA_CONFDIR/exports/export.$VOL.conf |\ +grep Export_Id | cut -d " " -f8` + + if [ -e /var/lib/glusterd/nfs/secret.pem ]; then + while [[ ${3} ]]; do + current_host=`echo ${3} | cut -d "." -f 1` + if [ ${short_host} != ${current_host} ]; then + cp ${HA_CONFDIR}/exports/export.$VOL.conf ${tganesha_export} + scp -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ +/var/lib/glusterd/nfs/secret.pem ${short_host}:${tganesha_export} \ +${current_host}:${HA_CONFDIR}/exports/export.$VOL.conf + rm -rf ${tganesha_export} + ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ +/var/lib/glusterd/nfs/secret.pem root@${current_host} "dbus-send --print-reply --system \ +--dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \ +org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id" + sleep 1 + ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ +/var/lib/glusterd/nfs/secret.pem root@${current_host} "dbus-send --system \ +--dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \ +org.ganesha.nfsd.exportmgr.AddExport string:$HA_CONFDIR/exports/export.$VOL.conf \ +string:\"EXPORT(Path=/$VOL)\"" + if [ $? -ne 0 ]; then + echo "warning: refresh-config failed on ${current_host}" + fi + fi + shift + done + else + echo "warning: refresh-config failed on ${1}" + fi + +#Run the same command on the localhost, + dbus-send --print-reply --system \ +--dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \ +org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id + sleep 1 + dbus-send --system \ +--dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \ +org.ganesha.nfsd.exportmgr.AddExport string:$HA_CONFDIR/exports/export.$VOL.conf \ +string:"EXPORT(Path=/$VOL)" +} + copy_export_config () { local new_node=${1} @@ -740,18 +806,25 @@ setup_state_volume() main() { + local cmd=${1}; shift + if [[ ${cmd} == *help ]] + then + usage + exit 0 + fi + HA_CONFDIR=${1}; shift local ha_conf=${HA_CONFDIR}/ganesha-ha.conf local node="" local vip="" # ignore any comment lines - cfgline=$(grep ^HA_NAME= ${ha_conf}) + cfgline=$(grep ^HA_NAME= ${ha_conf}) eval $(echo ${cfgline} | grep -F HA_NAME=) - cfgline=$(grep ^HA_VOL_SERVER= ${ha_conf}) + cfgline=$(grep ^HA_VOL_SERVER= ${ha_conf}) eval $(echo ${cfgline} | grep -F HA_VOL_SERVER=) - cfgline=$(grep ^HA_CLUSTER_NODES= ${ha_conf}) + cfgline=$(grep ^HA_CLUSTER_NODES= ${ha_conf}) eval $(echo ${cfgline} | grep -F HA_CLUSTER_NODES=) # we'll pretend that nobody ever edits /etc/os-release @@ -864,18 +937,17 @@ $HA_CONFDIR/ganesha-ha.conf ;; refresh-config | --refresh-config) - ;; + VOL=${1} - help | --help) - echo "Usage : add|delete|status" - echo "Add-node : ganesha-ha.sh --add <HA_CONFDIR> \ -<NODE-IP/HOSTNAME> <NODE-VIP>" - echo "Delete-node: ganesha-ha.sh --delete <HA_CONFDIR> \ -<NODE-IP/HOSTNAME>" + determine_servers "refresh-config" + + refresh_config ${VOL} ${HA_CONFDIR} ${HA_SERVERS} ;; + *) # setup and teardown are not intended to be used by a # casual user + usage logger "Usage: ganesha-ha.sh add|delete|status" ;; |