diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2017-02-02 11:41:06 -0500 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2017-02-02 15:46:19 -0500 |
| commit | 1e849f616f6ae2f97ab307abaff69182c87571ca (patch) | |
| tree | 0bcb6822cd1a6936af41ee34f138fd048206e261 /tests/bugs/distribute | |
| parent | 5a57c1592a34ee6632ca1fb38e076dde381d1ae2 (diff) | |
tests: use kill_brick instead of kill -9
The system actually handles this OK, but with multiplexing the result
of killing the whole process is not what some tests assumed.
Change-Id: I89ebf0039ab1369f25b0bfec3710ec4c13725915
BUG: 1385758
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: https://review.gluster.org/16528
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'tests/bugs/distribute')
| -rw-r--r-- | tests/bugs/distribute/bug-860663.t | 2 | ||||
| -rw-r--r-- | tests/bugs/distribute/bug-862967.t | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/bugs/distribute/bug-860663.t b/tests/bugs/distribute/bug-860663.t index 43511945cb9..59b8223ef3f 100644 --- a/tests/bugs/distribute/bug-860663.t +++ b/tests/bugs/distribute/bug-860663.t @@ -35,7 +35,7 @@ ORIG_FILE_COUNT=`ls -l $M0 | wc -l`; TEST [ $ORIG_FILE_COUNT -ge 1000 ] # Kill a brick process -kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`; +kill_brick $V0 $H0 $B0/${V0}1 TEST $CLI volume rebalance $V0 fix-layout start diff --git a/tests/bugs/distribute/bug-862967.t b/tests/bugs/distribute/bug-862967.t index 07b053787ba..09dac376d94 100644 --- a/tests/bugs/distribute/bug-862967.t +++ b/tests/bugs/distribute/bug-862967.t @@ -1,6 +1,7 @@ #!/bin/bash . $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc cleanup; @@ -36,7 +37,7 @@ chown 1:1 $M0/dir; # Kill a brick process -kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`; +kill_brick $V0 $H0 $B0/${V0}1 # change dir ownership NEW_UID=36; NEW_GID=36; |