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/cluster.rc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/cluster.rc') diff --git a/tests/cluster.rc b/tests/cluster.rc index 467bbcb06e1..6dece8182e4 100644 --- a/tests/cluster.rc +++ b/tests/cluster.rc @@ -95,6 +95,7 @@ function kill_node() { h="H$index"; kill -9 $(ps -ef | grep gluster | grep ${!h} | awk '{print $2}'); + find $B0/$index/glusterd/vols -name '*.pid' | xargs rm -f } @@ -177,3 +178,14 @@ function brick_up_status_1 { local brick=$3 $CLI_1 volume status $vol $host:$brick --xml | sed -ne 's/.*\([01]\)<\/status>/\1/p' } + +function online_brick_count { + local bricks + local total=0 + local i + for i in $(seq 1 $CLUSTER_COUNT); do + bricks=$(find $B0/$i/glusterd/vols -name '*.pid' | wc -l) + total=$((total+bricks)) + done + echo $total +} -- cgit