summaryrefslogtreecommitdiffstats
path: root/tests/volume.rc
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2016-07-22 20:24:51 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-07-22 16:23:28 -0700
commitdac9ec0c015e748c0e7909496cdc636831975e0e (patch)
treeb8d5fdff11e6277a82c23780cfc205d3cdcf8ffd /tests/volume.rc
parentb1559c2d1cfcff76df5870563a84cc22c752cc58 (diff)
tests: Remove hard coding in get_aux
Change-Id: Ie007d8006a2f2be0187f0c73d46ec6dda2a68a6b Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/14988 Smoke: Gluster Build System <jenkins@build.gluster.org> Tested-by: Jeff Darcy <jdarcy@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'tests/volume.rc')
-rw-r--r--tests/volume.rc16
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/volume.rc b/tests/volume.rc
index 331a802..cb63e32 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -579,11 +579,19 @@ function num_graphs
function get_aux()
{
##Check if a auxiliary mount is there
-df -h 2>&1 | sed 's#/build/install##' | grep -e "[[:space:]]/run/gluster/${V0}$" -e "[[:space:]]/var/run/gluster/${V0}$" -
-
-if [ $? -eq 0 ]
+local rundir=$(gluster --print-statedumpdir)
+local pidfile="${rundir}/${V0}.pid"
+if [ -f $pidfile ];
then
- echo "0"
+ local pid=$(cat ${rundir}/${V0}.pid)
+ pidof glusterfs 2>&1 | grep -w $pid > /dev/null
+
+ if [ $? -eq 0 ]
+ then
+ echo "0"
+ else
+ echo "1"
+ fi
else
echo "1"
fi