From e6f2472d2434ab43a30720ef4de2e0abc0a3f4ac Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 27 Apr 2015 01:20:02 +0530 Subject: libglusterfs: Fix cluster_entrylk retry Change-Id: I92ff46bae36d39a449d4bbaedc88a322992f65eb BUG: 1215265 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/10391 Tested-by: Gluster Build System Reviewed-by: Krutika Dhananjay --- .../bugs/bitrot/1207029-bitrot-daemon-should-start-on-valid-node.t | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/bugs/bitrot') diff --git a/tests/bugs/bitrot/1207029-bitrot-daemon-should-start-on-valid-node.t b/tests/bugs/bitrot/1207029-bitrot-daemon-should-start-on-valid-node.t index e5b53bd0d24..120facff02e 100755 --- a/tests/bugs/bitrot/1207029-bitrot-daemon-should-start-on-valid-node.t +++ b/tests/bugs/bitrot/1207029-bitrot-daemon-should-start-on-valid-node.t @@ -10,6 +10,9 @@ cleanup; +function get_bitd_count { + ps auxw | grep glusterfs | grep bitd.pid | grep -v grep | wc -l +} ## Start a 2 node virtual cluster TEST launch_cluster 2; @@ -30,8 +33,7 @@ TEST $CLI_1 volume bitrot $V0 enable ## Bitd daemon should be running on the node which is having brick. Here node1 ## only have brick so bitrot daemon count value should be 1. -bitrot_daemon=$(ps auxww | grep glusterfs | grep bitd.pid | grep -v grep | wc -l) -TEST [ "$bitrot_daemon" -eq 1 ]; +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count ## Bitd daemon should not run on 2nd node and it should not create bitrot ## volfile on this node. Below test case it to check whether its creating bitrot -- cgit