diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2017-02-02 10:22:00 -0500 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2017-02-07 22:22:19 -0500 |
| commit | 4a7fd196d4a141f2b693d5b49995733f6ad1776f (patch) | |
| tree | f6b5eb35bb42cb4f5fabe4e8613690f0117927f2 /tests/volume.rc | |
| parent | 3cbf73225111b2fd04414f1fa0aea33ffedf10b2 (diff) | |
tests: fix online_brick_count for multiplexing
The number of brick processes no longer matches the number of bricks,
therefore counting processes doesn't work. Counting *pidfiles* does.
Ironically, the fix broke multiplex.t which used this function, so it
now uses a different function with the old process-counting behavior.
Also had to fix online_brick_count and kill_node in cluster.rc to be
consistent with the new reality.
Change-Id: I4e81a6633b93227e10604f53e18a0b802c75cbcc
BUG: 1385758
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: https://review.gluster.org/16527
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/volume.rc')
| -rw-r--r-- | tests/volume.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/volume.rc b/tests/volume.rc index 2062f42940e..3a649e850a6 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -23,7 +23,7 @@ function brick_count() function online_brick_count () { - pgrep glusterfsd | wc -l + find $GLUSTERD_WORKDIR/vols/ -name '*.pid' | wc -l } function brick_up_status { |