From ecc475d0a517d7f58014bed93fc0957b3369d1b7 Mon Sep 17 00:00:00 2001 From: Raghavendra Talur Date: Thu, 6 Mar 2014 19:09:13 +0530 Subject: hook-scripts: Move smb hooks to right place. Moved the hook-scripts to dirs corresponding to event. Also, edited S30samba-set.sh to with changes in other two hook scripts to bring uniformity. Change-Id: Ib98c0a18d4bb5d0ba4b881b2e19b40d72580b1c2 BUG: 1073468 Signed-off-by: Raghavendra Talur Reviewed-on: http://review.gluster.org/7201 Reviewed-by: Poornima G Reviewed-by: Bala FA Tested-by: Gluster Build System --- extras/hook-scripts/Makefile.am | 4 +- extras/hook-scripts/S29CTDBsetup.sh | 69 ------------- extras/hook-scripts/S30samba-set.sh | 109 -------------------- extras/hook-scripts/S30samba-start.sh | 110 -------------------- extras/hook-scripts/S30samba-stop.sh | 71 ------------- extras/hook-scripts/set/Makefile.am | 2 + extras/hook-scripts/set/post/Makefile.am | 1 + extras/hook-scripts/set/post/S30samba-set.sh | 126 +++++++++++++++++++++++ extras/hook-scripts/start/Makefile.am | 2 + extras/hook-scripts/start/post/Makefile.am | 1 + extras/hook-scripts/start/post/S29CTDBsetup.sh | 77 ++++++++++++++ extras/hook-scripts/start/post/S30samba-start.sh | 110 ++++++++++++++++++++ extras/hook-scripts/stop/Makefile.am | 2 + extras/hook-scripts/stop/pre/Makefile.am | 1 + extras/hook-scripts/stop/pre/S29CTDB-teardown.sh | 80 ++++++++++++++ extras/hook-scripts/stop/pre/S30samba-stop.sh | 71 +++++++++++++ 16 files changed, 475 insertions(+), 361 deletions(-) delete mode 100644 extras/hook-scripts/S29CTDBsetup.sh delete mode 100755 extras/hook-scripts/S30samba-set.sh delete mode 100755 extras/hook-scripts/S30samba-start.sh delete mode 100755 extras/hook-scripts/S30samba-stop.sh create mode 100644 extras/hook-scripts/set/Makefile.am create mode 100644 extras/hook-scripts/set/post/Makefile.am create mode 100755 extras/hook-scripts/set/post/S30samba-set.sh create mode 100644 extras/hook-scripts/start/Makefile.am create mode 100644 extras/hook-scripts/start/post/Makefile.am create mode 100755 extras/hook-scripts/start/post/S29CTDBsetup.sh create mode 100755 extras/hook-scripts/start/post/S30samba-start.sh create mode 100644 extras/hook-scripts/stop/Makefile.am create mode 100644 extras/hook-scripts/stop/pre/Makefile.am create mode 100755 extras/hook-scripts/stop/pre/S29CTDB-teardown.sh create mode 100755 extras/hook-scripts/stop/pre/S30samba-stop.sh (limited to 'extras') diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am index 0e542b4cc..dd67c248e 100644 --- a/extras/hook-scripts/Makefile.am +++ b/extras/hook-scripts/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh S30samba-stop.sh S30samba-set.sh S56glusterd-geo-rep-create-post.sh -SUBDIRS = add-brick +EXTRA_DIST = S40ufo-stop.py S56glusterd-geo-rep-create-post.sh +SUBDIRS = add-brick set start stop diff --git a/extras/hook-scripts/S29CTDBsetup.sh b/extras/hook-scripts/S29CTDBsetup.sh deleted file mode 100644 index e256be1f3..000000000 --- a/extras/hook-scripts/S29CTDBsetup.sh +++ /dev/null @@ -1,69 +0,0 @@ -#! /bin/bash -#non-portable - RHS-2.0 only -# - The script mounts the 'meta-vol' on start 'event' on a known -# directory (eg. /gluster/lock) -# - Adds the necessary configuration changes for ctdb in smb.conf and -# restarts smb service. -# - P.S: There are other 'tasks' that need to be done outside this script -# to get CTDB based failover up and running. - -SMB_CONF=/etc/samba/smb.conf - -CTDB_MNT=/gluster/lock -PROGNAME="ctdb" -OPTSPEC="volname:" -VOL= -# $META is the volume that will be used by CTDB as a shared filesystem. -# It is not desirable to use this volume for storing 'data' as well. -# META is set to 'all' (viz. a keyword and hence not a legal volume name) -# to prevent the script from running for volumes it was not intended. -# User needs to set META to the volume that serves CTDB lockfile. -META="all" - -function sighup_samba () { - pid=`cat /var/run/smbd.pid` - if [ $pid != " " ] - then - kill -HUP $pid; - else - /etc/init.d/smb start - fi -} - -function parse_args () { - ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) - eval set -- "$ARGS" - - while true; do - case $1 in - --volname) - shift - VOL=$1 - ;; - - *) - shift - break - ;; - - esac - - shift - done -} - -function add_glusterfs_ctdb_options () { - PAT="Share Definitions" - GLUSTER_CTDB_CONFIG="# ctdb config for glusterfs\n\tclustering = yes\n\tidmap backend = tdb2\n\tprivate dir = "$CTDB_MNT"\n" - - sed -i /"$PAT"/i\ "$GLUSTER_CTDB_CONFIG" $SMB_CONF -} - -parse_args $@ -if [ "$META" = "$VOL" ] -then - add_glusterfs_ctdb_options - sighup_samba - mount -t glusterfs `hostname`:$VOL "$CTDB_MNT" & -fi - diff --git a/extras/hook-scripts/S30samba-set.sh b/extras/hook-scripts/S30samba-set.sh deleted file mode 100755 index 2fc65c278..000000000 --- a/extras/hook-scripts/S30samba-set.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -#Need to be copied to hooks//set/post/ - -#TODO: All gluster and samba paths are assumed for fedora like systems. -#Some efforts are required to make it work on other distros. - -#The preferred way of creating a smb share of a gluster volume has changed. -#The old method was to create a fuse mount of the volume and share the mount -#point through samba. -# -#New method eliminates the requirement of fuse mount and changes in fstab. -#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume. -# -#This hook script enables user to enable or disable smb share by volume set -#option. Keys "user.cifs" and "user.smb" both are valid, but user.smb is -#preferred. - - -PROGNAME="Ssamba-set" -OPTSPEC="volname:" -VOL= - -enable_smb="" - -function parse_args () { - ARGS=$(getopt -l $OPTSPEC -o "o" -name $PROGNAME $@) - eval set -- "$ARGS" - - while true; do - case $1 in - --volname) - shift - VOL=$1 - ;; - *) - shift - for pair in $@; do - read key value < <(echo "$pair" | tr "=" " ") - case "$key" in - "user.cifs") - enable_smb=$value - ;; - "user.smb") - enable_smb=$value - ;; - *) - ;; - esac - done - - shift - break - ;; - esac - shift - done -} - -function add_samba_share () { - volname=$1 - STRING="\n[gluster-$volname]\n" - STRING+="comment = For samba share of volume $volname\n" - STRING+="vfs objects = glusterfs\n" - STRING+="glusterfs:volume = $volname\n" - STRING+="glusterfs:logfile = /var/log/samba/glusterfs-$volname.%%M.log\n" - STRING+="glusterfs:loglevel = 7\n" - STRING+="path = %%P/\n" - STRING+="read only = no\n" - STRING+="guest ok = yes\n" - printf "$STRING" >> /etc/samba/smb.conf -} - -function sighup_samba () { - pid=`cat /var/run/smbd.pid` - if [ "x$pid" != "x" ] - then - kill -HUP "$pid"; - else - /etc/init.d/smb start - fi -} - -function del_samba_share () { - volname=$1 - sed -i "/\[gluster-$volname\]/,/^$/d" /etc/samba/smb.conf -} - -function is_volume_started () { - volname=$1 - echo "$(grep status /var/lib/glusterd/vols/"$volname"/info |\ - cut -d"=" -f2)" -} - -parse_args $@ -if [ "0" = $(is_volume_started "$VOL") ]; then - exit 0 -fi - -if [ "$enable_smb" = "enable" ]; then - if ! grep --quiet "\[gluster-$VOL\]" /etc/samba/smb.conf ; then - add_samba_share $VOL - sighup_samba - fi - -elif [ "$enable_smb" = "disable" ]; then - del_samba_share $VOL - sighup_samba -fi diff --git a/extras/hook-scripts/S30samba-start.sh b/extras/hook-scripts/S30samba-start.sh deleted file mode 100755 index 34fde0ef8..000000000 --- a/extras/hook-scripts/S30samba-start.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -#Need to be copied to hooks//start/post - -#TODO: All gluster and samba paths are assumed for fedora like systems. -#Some efforts are required to make it work on other distros. - -#The preferred way of creating a smb share of a gluster volume has changed. -#The old method was to create a fuse mount of the volume and share the mount -#point through samba. -# -#New method eliminates the requirement of fuse mount and changes in fstab. -#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume. -# -#This hook script automagically creates shares for volume on every volume start -#event by adding the entries in smb.conf file and sending SIGHUP to samba. -# -#In smb.conf: -#glusterfs vfs plugin has to be specified as required vfs object. -#Path value is relative to the root of gluster volume;"/" signifies complete -#volume. - -PROGNAME="Ssamba-start" -OPTSPEC="volname:" -VOL= -CONFIGFILE= -LOGFILEBASE= -PIDDIR= - -function parse_args () { - ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) - eval set -- "$ARGS" - - while true; do - case $1 in - --volname) - shift - VOL=$1 - ;; - *) - shift - break - ;; - esac - shift - done -} - -function find_config_info () { - cmdout=`smbd -b | grep smb.conf` - if [ $? -ne 0 ];then - echo "Samba is not installed" - exit 1 - fi - CONFIGFILE=`echo $cmdout | awk {'print $2'}` - PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}` - LOGFILEBASE=`smbd -b | grep 'LOGFILEBASE' | awk '{print $2}'` -} - -function add_samba_share () { - volname=$1 - STRING="\n[gluster-$volname]\n" - STRING+="comment = For samba share of volume $volname\n" - STRING+="vfs objects = glusterfs\n" - STRING+="glusterfs:volume = $volname\n" - STRING+="glusterfs:logfile = $LOGFILEBASE/glusterfs-$volname.%%M.log\n" - STRING+="glusterfs:loglevel = 7\n" - STRING+="path = /\n" - STRING+="read only = no\n" - STRING+="guest ok = yes\n" - printf "$STRING" >> ${CONFIGFILE} -} - -function sighup_samba () { - pid=`cat ${PIDDIR}/smbd.pid` - if [ "x$pid" != "x" ] - then - kill -HUP "$pid"; - else - /etc/init.d/smb condrestart - fi -} - -function get_smb () { - volname=$1 - uservalue= - - usercifsvalue=$(grep user.cifs /var/lib/glusterd/vols/"$volname"/info |\ - cut -d"=" -f2) - usersmbvalue=$(grep user.smb /var/lib/glusterd/vols/"$volname"/info |\ - cut -d"=" -f2) - - if [[ $usercifsvalue = "disable" || $usersmbvalue = "disable" ]]; then - uservalue="disable" - fi - echo "$uservalue" -} - -parse_args $@ -if [ $(get_smb "$VOL") = "disable" ]; then - exit 0 -fi - -#Find smb.conf, smbd pid directory and smbd logfile path -find_config_info - -if ! grep --quiet "\[gluster-$VOL\]" ${CONFIGFILE} ; then - add_samba_share $VOL - sighup_samba -fi diff --git a/extras/hook-scripts/S30samba-stop.sh b/extras/hook-scripts/S30samba-stop.sh deleted file mode 100755 index 8950eea43..000000000 --- a/extras/hook-scripts/S30samba-stop.sh +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/bash - -#Need to be copied to hooks//stop/pre - -#TODO: All gluster and samba paths are assumed for fedora like systems. -#Some efforts are required to make it work on other distros. - -#The preferred way of creating a smb share of a gluster volume has changed. -#The old method was to create a fuse mount of the volume and share the mount -#point through samba. -# -#New method eliminates the requirement of fuse mount and changes in fstab. -#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume. -# -#This hook script automagically removes shares for volume on every volume stop -#event by removing the volume related entries(if any) in smb.conf file. - -PROGNAME="Ssamba-stop" -OPTSPEC="volname:" -VOL= -CONFIGFILE= -PIDDIR= - -function parse_args () { - ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) - eval set -- "$ARGS" - - while true; do - case $1 in - --volname) - shift - VOL=$1 - ;; - *) - shift - break - ;; - esac - shift - done -} - -function find_config_info () { - cmdout=`smbd -b | grep smb.conf` - if [ $? -ne 0 ];then - echo "Samba is not installed" - exit 1 - fi - CONFIGFILE=`echo $cmdout | awk {'print $2'}` - PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}` -} - -function del_samba_share () { - volname=$1 - sed -i "/\[gluster-$volname\]/,/^$/d" ${CONFIGFILE} -} - -function sighup_samba () { - pid=`cat ${PIDDIR}/smbd.pid` - if [ "x$pid" != "x" ] - then - kill -HUP $pid; - else - /etc/init.d/smb condrestart - fi -} - -parse_args $@ -find_config_info -del_samba_share $VOL -sighup_samba diff --git a/extras/hook-scripts/set/Makefile.am b/extras/hook-scripts/set/Makefile.am new file mode 100644 index 000000000..1fcade4b0 --- /dev/null +++ b/extras/hook-scripts/set/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = post +CLEANFILES = diff --git a/extras/hook-scripts/set/post/Makefile.am b/extras/hook-scripts/set/post/Makefile.am new file mode 100644 index 000000000..9ded234cf --- /dev/null +++ b/extras/hook-scripts/set/post/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = S30samba-set.sh diff --git a/extras/hook-scripts/set/post/S30samba-set.sh b/extras/hook-scripts/set/post/S30samba-set.sh new file mode 100755 index 000000000..88f6e797b --- /dev/null +++ b/extras/hook-scripts/set/post/S30samba-set.sh @@ -0,0 +1,126 @@ +#!/bin/bash + +#Need to be copied to hooks//set/post/ + +#TODO: All gluster and samba paths are assumed for fedora like systems. +#Some efforts are required to make it work on other distros. + +#The preferred way of creating a smb share of a gluster volume has changed. +#The old method was to create a fuse mount of the volume and share the mount +#point through samba. +# +#New method eliminates the requirement of fuse mount and changes in fstab. +#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume. +# +#This hook script enables user to enable or disable smb share by volume set +#option. Keys "user.cifs" and "user.smb" both are valid, but user.smb is +#preferred. + + +PROGNAME="Ssamba-set" +OPTSPEC="volname:" +VOL= +CONFIGFILE= +LOGFILEBASE= +PIDDIR= + +enable_smb="" + +function parse_args () { + ARGS=$(getopt -l $OPTSPEC -o "o" -name $PROGNAME $@) + eval set -- "$ARGS" + + while true; do + case $1 in + --volname) + shift + VOL=$1 + ;; + *) + shift + for pair in $@; do + read key value < <(echo "$pair" | tr "=" " ") + case "$key" in + "user.cifs") + enable_smb=$value + ;; + "user.smb") + enable_smb=$value + ;; + *) + ;; + esac + done + + shift + break + ;; + esac + shift + done +} + +function find_config_info () { + cmdout=`smbd -b | grep smb.conf` + if [ $? -ne 0 ]; then + echo "Samba is not installed" + exit 1 + fi + CONFIGFILE=`echo $cmdout | awk '{print $2}'` + PIDDIR=`smbd -b | grep PIDDIR | awk '{print $2}'` + LOGFILEBASE=`smbd -b | grep 'LOGFILEBASE' | awk '{print $2}'` +} + +function add_samba_share () { + volname=$1 + STRING="\n[gluster-$volname]\n" + STRING+="comment = For samba share of volume $volname\n" + STRING+="vfs objects = glusterfs\n" + STRING+="glusterfs:volume = $volname\n" + STRING+="glusterfs:logfile = $LOGFILEBASE/glusterfs-$volname.%%M.log\n" + STRING+="glusterfs:loglevel = 7\n" + STRING+="path = %%P/\n" + STRING+="read only = no\n" + STRING+="guest ok = yes\n" + printf "$STRING" >> ${CONFIGFILE} +} + +function sighup_samba () { + pid=`cat ${PIDDIR}/smbd.pid` + if [ "x$pid" != "x" ] + then + kill -HUP "$pid"; + else + /etc/init.d/smb start + fi +} + +function del_samba_share () { + volname=$1 + sed -i "/\[gluster-$volname\]/,/^$/d" /etc/samba/smb.conf +} + +function is_volume_started () { + volname=$1 + echo "$(grep status /var/lib/glusterd/vols/"$volname"/info |\ + cut -d"=" -f2)" +} + +parse_args $@ +if [ "0" = $(is_volume_started "$VOL") ]; then + exit 0 +fi + +#Find smb.conf, smbd pid directory and smbd logfile path +find_config_info + +if [ "$enable_smb" = "enable" ]; then + if ! grep --quiet "\[gluster-$VOL\]" /etc/samba/smb.conf ; then + add_samba_share $VOL + sighup_samba + fi + +elif [ "$enable_smb" = "disable" ]; then + del_samba_share $VOL + sighup_samba +fi diff --git a/extras/hook-scripts/start/Makefile.am b/extras/hook-scripts/start/Makefile.am new file mode 100644 index 000000000..1fcade4b0 --- /dev/null +++ b/extras/hook-scripts/start/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = post +CLEANFILES = diff --git a/extras/hook-scripts/start/post/Makefile.am b/extras/hook-scripts/start/post/Makefile.am new file mode 100644 index 000000000..d9cba93ed --- /dev/null +++ b/extras/hook-scripts/start/post/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh diff --git a/extras/hook-scripts/start/post/S29CTDBsetup.sh b/extras/hook-scripts/start/post/S29CTDBsetup.sh new file mode 100755 index 000000000..da077a6fb --- /dev/null +++ b/extras/hook-scripts/start/post/S29CTDBsetup.sh @@ -0,0 +1,77 @@ +#! /bin/bash +# RHS-2.0 only +# - The script mounts the 'meta-vol' on start 'event' on a known +# directory (eg. /gluster/lock) +# - Adds the necessary configuration changes for ctdb in smb.conf and +# restarts smb service. +# - P.S: There are other 'tasks' that need to be done outside this script +# to get CTDB based failover up and running. + +SMB_CONF=/etc/samba/smb.conf + +CTDB_MNT=/gluster/lock +PROGNAME="ctdb" +OPTSPEC="volname:" +VOL= +# $META is the volume that will be used by CTDB as a shared filesystem. +# It is not desirable to use this volume for storing 'data' as well. +# META is set to 'all' (viz. a keyword and hence not a legal volume name) +# to prevent the script from running for volumes it was not intended. +# User needs to set META to the volume that serves CTDB lockfile. +META="all" + +function parse_args () { + ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) + eval set -- "$ARGS" + + while true; do + case $1 in + --volname) + shift + VOL=$1 + ;; + + *) + shift + break + ;; + + esac + + shift + done +} + +function add_glusterfs_ctdb_options () { + PAT="Share Definitions" + GLUSTER_CTDB_CONFIG="# ctdb config for glusterfs\n\tclustering = yes\n\tidmap backend = tdb2\n" + exists=`grep "clustering = yes" "$SMB_CONF"` + if [ "$exists" == "" ] + then + sed -i /"$PAT"/i\ "$GLUSTER_CTDB_CONFIG" "$SMB_CONF" + fi +} + +function add_fstab_entry () { + volname=$1 + mntpt=$2 + mntent="`hostname`:/$volname $mntpt glusterfs defaults,transport=tcp 0 0" + exists=`grep "^$mntent" /etc/fstab` + if [ "$exists" == "" ] + then + echo "$mntent" >> /etc/fstab + fi +} + +parse_args $@ +if [ "$META" = "$VOL" ] +then + #expects ctdb service to manage smb + service smb stop + add_glusterfs_ctdb_options + mkdir -p $CTDB_MNT + sleep 5 + mount -t glusterfs `hostname`:$VOL "$CTDB_MNT" && \ + add_fstab_entry $VOL $CTDB_MNT + chkconfig ctdb on +fi diff --git a/extras/hook-scripts/start/post/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh new file mode 100755 index 000000000..529348e25 --- /dev/null +++ b/extras/hook-scripts/start/post/S30samba-start.sh @@ -0,0 +1,110 @@ +#!/bin/bash + +#Need to be copied to hooks//start/post + +#TODO: All gluster and samba paths are assumed for fedora like systems. +#Some efforts are required to make it work on other distros. + +#The preferred way of creating a smb share of a gluster volume has changed. +#The old method was to create a fuse mount of the volume and share the mount +#point through samba. +# +#New method eliminates the requirement of fuse mount and changes in fstab. +#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume. +# +#This hook script automagically creates shares for volume on every volume start +#event by adding the entries in smb.conf file and sending SIGHUP to samba. +# +#In smb.conf: +#glusterfs vfs plugin has to be specified as required vfs object. +#Path value is relative to the root of gluster volume;"/" signifies complete +#volume. + +PROGNAME="Ssamba-start" +OPTSPEC="volname:" +VOL= +CONFIGFILE= +LOGFILEBASE= +PIDDIR= + +function parse_args () { + ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) + eval set -- "$ARGS" + + while true; do + case $1 in + --volname) + shift + VOL=$1 + ;; + *) + shift + break + ;; + esac + shift + done +} + +function find_config_info () { + cmdout=`smbd -b | grep smb.conf` + if [ $? -ne 0 ];then + echo "Samba is not installed" + exit 1 + fi + CONFIGFILE=`echo $cmdout | awk {'print $2'}` + PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}` + LOGFILEBASE=`smbd -b | grep 'LOGFILEBASE' | awk '{print $2}'` +} + +function add_samba_share () { + volname=$1 + STRING="\n[gluster-$volname]\n" + STRING+="comment = For samba share of volume $volname\n" + STRING+="vfs objects = glusterfs\n" + STRING+="glusterfs:volume = $volname\n" + STRING+="glusterfs:logfile = $LOGFILEBASE/glusterfs-$volname.%%M.log\n" + STRING+="glusterfs:loglevel = 7\n" + STRING+="path = %%P/\n" + STRING+="read only = no\n" + STRING+="guest ok = yes\n" + printf "$STRING" >> ${CONFIGFILE} +} + +function sighup_samba () { + pid=`cat ${PIDDIR}/smbd.pid` + if [ "x$pid" != "x" ] + then + kill -HUP "$pid"; + else + /etc/init.d/smb condrestart + fi +} + +function get_smb () { + volname=$1 + uservalue= + + usercifsvalue=$(grep user.cifs /var/lib/glusterd/vols/"$volname"/info |\ + cut -d"=" -f2) + usersmbvalue=$(grep user.smb /var/lib/glusterd/vols/"$volname"/info |\ + cut -d"=" -f2) + + if [[ $usercifsvalue = "disable" || $usersmbvalue = "disable" ]]; then + uservalue="disable" + fi + echo "$uservalue" +} + +parse_args $@ +if [ $(get_smb "$VOL") = "disable" ]; then + exit 0 +fi + +#Find smb.conf, smbd pid directory and smbd logfile path +find_config_info + +if ! grep --quiet "\[gluster-$VOL\]" ${CONFIGFILE} ; then + add_samba_share $VOL + sighup_samba +fi diff --git a/extras/hook-scripts/stop/Makefile.am b/extras/hook-scripts/stop/Makefile.am new file mode 100644 index 000000000..e2ac8e274 --- /dev/null +++ b/extras/hook-scripts/stop/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = pre +CLEANFILES = diff --git a/extras/hook-scripts/stop/pre/Makefile.am b/extras/hook-scripts/stop/pre/Makefile.am new file mode 100644 index 000000000..85243adbe --- /dev/null +++ b/extras/hook-scripts/stop/pre/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = S29CTDB-teardown.sh S30samba-stop.sh diff --git a/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh b/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh new file mode 100755 index 000000000..0b6e50ead --- /dev/null +++ b/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh @@ -0,0 +1,80 @@ +#! /bin/bash +#non-portable - RHS-2.0 only +SMB_CONF=/etc/samba/smb.conf + +CTDB_MNT=/gluster/lock +PROGNAME="ctdb" +OPTSPEC="volname:" +VOL= +# $META is the volume that will be used by CTDB as a shared filesystem. +# It is not desirable to use this volume for storing 'data' as well. +# META is set to 'all' (viz. a keyword and hence not a legal volume name) +# to prevent the script from running for volumes it was not intended. +# User needs to set META to the volume that serves CTDB lockfile. +META="all" + +function sighup_samba () { + pid=`cat /var/run/smbd.pid` + if [ "$pid" != "" ] + then + kill -HUP $pid; + else + /etc/init.d/smb start + fi +} + +function parse_args () { + ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) + eval set -- "$ARGS" + + while true; do + case $1 in + --volname) + shift + VOL=$1 + ;; + + *) + shift + break + ;; + + esac + + shift + done +} + + +function remove_ctdb_options () { + IFS=$'\n' + GLUSTER_CTDB_CONFIG=$'# ctdb config for glusterfs\n\tclustering = yes\n\tidmap backend = tdb2\n' + + for line in $GLUSTER_CTDB_CONFIG + do + sed -i /"$line"/d $SMB_CONF + done + unset IFS +} + +function remove_fstab_entry () { + volname=$1 + mntpt=$2 + mntent="`hostname`:/$volname $mntpt glusterfs defaults,transport=tcp 0 0" + esc_mntent=$(echo -e "$mntent" | sed 's/\//\\\//g') + exists=`grep "^$mntent" /etc/fstab` + if [ "$exists" != " " ] + then + sed -i /"$esc_mntent"/d /etc/fstab + fi +} + +parse_args $@ +if [ "$META" = "$VOL" ] +then + umount "$CTDB_MNT" + chkconfig ctdb off + remove_fstab_entry $VOL $CTDB_MNT + remove_ctdb_options + sighup_samba +fi diff --git a/extras/hook-scripts/stop/pre/S30samba-stop.sh b/extras/hook-scripts/stop/pre/S30samba-stop.sh new file mode 100755 index 000000000..8950eea43 --- /dev/null +++ b/extras/hook-scripts/stop/pre/S30samba-stop.sh @@ -0,0 +1,71 @@ +#! /bin/bash + +#Need to be copied to hooks//stop/pre + +#TODO: All gluster and samba paths are assumed for fedora like systems. +#Some efforts are required to make it work on other distros. + +#The preferred way of creating a smb share of a gluster volume has changed. +#The old method was to create a fuse mount of the volume and share the mount +#point through samba. +# +#New method eliminates the requirement of fuse mount and changes in fstab. +#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume. +# +#This hook script automagically removes shares for volume on every volume stop +#event by removing the volume related entries(if any) in smb.conf file. + +PROGNAME="Ssamba-stop" +OPTSPEC="volname:" +VOL= +CONFIGFILE= +PIDDIR= + +function parse_args () { + ARGS=$(getopt -l $OPTSPEC -name $PROGNAME $@) + eval set -- "$ARGS" + + while true; do + case $1 in + --volname) + shift + VOL=$1 + ;; + *) + shift + break + ;; + esac + shift + done +} + +function find_config_info () { + cmdout=`smbd -b | grep smb.conf` + if [ $? -ne 0 ];then + echo "Samba is not installed" + exit 1 + fi + CONFIGFILE=`echo $cmdout | awk {'print $2'}` + PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}` +} + +function del_samba_share () { + volname=$1 + sed -i "/\[gluster-$volname\]/,/^$/d" ${CONFIGFILE} +} + +function sighup_samba () { + pid=`cat ${PIDDIR}/smbd.pid` + if [ "x$pid" != "x" ] + then + kill -HUP $pid; + else + /etc/init.d/smb condrestart + fi +} + +parse_args $@ +find_config_info +del_samba_share $VOL +sighup_samba -- cgit