diff options
Diffstat (limited to 'tests/volume.rc')
| -rw-r--r-- | tests/volume.rc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/volume.rc b/tests/volume.rc index 369e5a706c6..1cee648993b 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -103,7 +103,7 @@ function get_nfs_pid () function read_nfs_pidfile () { - echo `cat $GLUSTERD_WORKDIR/nfs/run/nfs.pid` + echo `cat $GLUSTERD_PIDFILEDIR/nfs/nfs.pid` } function cleanup_statedump { @@ -230,7 +230,7 @@ function ec_child_up_count_shd { } function get_shd_process_pid { - ps auxww | grep glusterfs | grep -E "glustershd/run/glustershd.pid" | awk '{print $2}' | head -1 + ps auxww | grep glusterfs | grep -E "glustershd/glustershd.pid" | awk '{print $2}' | head -1 } function generate_shd_statedump { @@ -279,7 +279,7 @@ function get_brick_pidfile { local host=$2 local brick=$3 local brick_hiphenated=$(echo $brick | tr '/' '-') - echo $GLUSTERD_WORKDIR/vols/$vol/run/${host}${brick_hiphenated}.pid + echo $GLUSTERD_PIDFILEDIR/vols/$vol/${host}${brick_hiphenated}.pid } function get_brick_pid { @@ -534,7 +534,7 @@ function volume_exists() { function killall_gluster() { pkill gluster - find $GLUSTERD_WORKDIR -name '*.pid' | xargs rm -f + find $GLUSTERD_PIDFILEDIR -name '*.pid' | xargs rm -f sleep 1 } |