From 4a7fd196d4a141f2b693d5b49995733f6ad1776f Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Thu, 2 Feb 2017 10:22:00 -0500 Subject: 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 Reviewed-on: https://review.gluster.org/16527 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Smoke: Gluster Build System Reviewed-by: Vijay Bellur --- tests/volume.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/volume.rc') 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 { -- cgit