diff options
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/ocf/volume.in | 18 | ||||
| -rwxr-xr-x | extras/stop-all-gluster-processes.sh | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/extras/ocf/volume.in b/extras/ocf/volume.in index 72fd1213af2..de05373b9e3 100755 --- a/extras/ocf/volume.in +++ b/extras/ocf/volume.in @@ -78,6 +78,16 @@ volume_getdir() { return 0 } +volume_getpid_dir() { + local volpid_dir + volpid_dir="/var/run/gluster/vols/${OCF_RESKEY_volname}" + + [ -d ${volpid_dir} ] || return 1 + + echo "${volpid_dir}" + return 0 +} + volume_getbricks() { local infofile local voldir @@ -92,17 +102,15 @@ volume_getbricks() { volume_getpids() { local bricks - local piddir local pidfile local infofile - local voldir + local volpid_dir - voldir=`volume_getdir` + volpid_dir=`volume_getpid_dir` bricks=`volume_getbricks` - piddir="${voldir}/run" for brick in ${bricks}; do - pidfile="${piddir}/${SHORTHOSTNAME}${brick}.pid" + pidfile="${volpid_dir}/${SHORTHOSTNAME}${brick}.pid" [ -e $pidfile ] || return 1 cat $pidfile done diff --git a/extras/stop-all-gluster-processes.sh b/extras/stop-all-gluster-processes.sh index 69fd601273e..ea2b48ee88b 100755 --- a/extras/stop-all-gluster-processes.sh +++ b/extras/stop-all-gluster-processes.sh @@ -72,7 +72,7 @@ kill_bricks_and_services() local pidfile local pid - for pidfile in $(find /var/lib/glusterd/ -name '*.pid'); + for pidfile in $(find /var/run/gluster/ -name '*.pid'); do local pid=$(cat ${pidfile}); echo "sending SIG${signal} to pid: ${pid}"; |