diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-06-29 18:56:44 -0700 | 
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-08-07 01:17:29 -0700 | 
| commit | 2ec6ea43f2ddc6c00a030be6d04c00f0924277b7 (patch) | |
| tree | b2d98cd8c4760c1af44c8b6a70661fe5566ce6da /extras/hook-scripts/reset | |
| parent | f29da9bcc812e3d0711005ce86051d70c277a165 (diff) | |
build: make GLUSTERD_WORKDIR rely on localstatedir
- Break-way from '/var/lib/glusterd' hard-coded previously,
  instead rely on 'configure' value from 'localstatedir'
- Provide 's/lib/db' as default working directory for gluster
  management daemon for BSD and Darwin based installations
- loff_t is really off_t on Darwin
- fix-off the warnings generated by clang on FreeBSD/Darwin
- Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all
  platforms.
- Define proper environment for running tests, define correct PATH
  and LD_LIBRARY_PATH when running tests, so that the desired version
  of glusterfs is used, regardless where it is installed.
  (Thanks to manu@netbsd.org for this additional work)
Change-Id: I2339a0d9275de5939ccad3e52b535598064a35e7
BUG: 1111774
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8246
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras/hook-scripts/reset')
| -rwxr-xr-x | extras/hook-scripts/reset/post/S31ganesha-reset.sh | 29 | 
1 files changed, 17 insertions, 12 deletions
diff --git a/extras/hook-scripts/reset/post/S31ganesha-reset.sh b/extras/hook-scripts/reset/post/S31ganesha-reset.sh index a683af5c0c0..c0be3f3841d 100755 --- a/extras/hook-scripts/reset/post/S31ganesha-reset.sh +++ b/extras/hook-scripts/reset/post/S31ganesha-reset.sh @@ -1,27 +1,35 @@  #/bin/bash  PROGNAME="Sganesha-reset" -OPTSPEC="volname:" +OPTSPEC="volname:,gd-workdir:"  VOL= +GLUSTERD_WORKDIR=  function parse_args () {          ARGS=$(getopt -l $OPTSPEC  -o "o" -name $PROGNAME $@)          eval set -- "$ARGS" -        case $1 in -            --volname) -               shift -               VOL=$1 -                ;; -        esac +        while true; do +            case $1 in +                --volname) +                    shift +                    VOL=$1 +                    ;; +                --gd-workdir) +                    shift +                    GLUSTERD_WORKDIR=$1 +                    ;; +            esac +            shift +        done  }  function is_volume_started () {          volname=$1 -        echo "$(grep status /var/lib/glusterd/vols/"$volname"/info |\ +        echo "$(grep status $GLUSTERD_WORKDIR/vols/"$volname"/info |\                  cut -d"=" -f2)"  }  parse_args $@ -if ps aux | grep -q "[g]anesha.nfsd" +if ps auxwww | grep -q "[g]anesha.nfsd"          then          kill -s TERM `cat /var/run/ganesha.pid`          sleep 10 @@ -33,6 +41,3 @@ if ps aux | grep -q "[g]anesha.nfsd"                  gluster volume start $VOL force          fi  fi - - -  | 
