From 4a5fb52eb1c5387a0fb8bfa1253e5227c7c255e8 Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Fri, 17 May 2019 18:10:47 +0530 Subject: glusterd: bulkvoldict thread is not handling all volumes Problem: In commit ac70f66c5805e10b3a1072bd467918730c0aeeb4 I missed one condition to populate volume dictionary in multiple threads while brick_multiplex is enabled.Due to that glusterd is not sending volume dictionary for all volumes to peer. Solution: Update the condition in code as well as update test case also to avoid the issue Change-Id: I06522dbdfee4f7e995d9cc7b7098fdf35340dc52 fixes: bz#1711250 Signed-off-by: Mohit Agrawal --- tests/bugs/glusterd/bug-1699339.t | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'tests/bugs/glusterd') diff --git a/tests/bugs/glusterd/bug-1699339.t b/tests/bugs/glusterd/bug-1699339.t index 3e950f48432..bb8d4f46eb8 100644 --- a/tests/bugs/glusterd/bug-1699339.t +++ b/tests/bugs/glusterd/bug-1699339.t @@ -52,18 +52,22 @@ done TEST kill_glusterd 1 -vol1=$(printf "%s-vol%02d" $V0 1) +TESTS_EXPECTED_IN_LOOP=4 +for i in `seq 1 3 15` +do +vol1=$(printf "%s-vol%02d" $V0 $i) TEST $CLI_2 volume set $vol1 performance.readdir-ahead on -vol2=$(printf "%s-vol%02d" $V0 2) -TEST $CLI_2 volume set $vol2 performance.readdir-ahead on +done # Bring back 1st glusterd TEST $glusterd_1 EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count +TESTS_EXPECTED_IN_LOOP=4 +for i in `seq 1 3 15` +do +vol1=$(printf "%s-vol%02d" $V0 $i) EXPECT_WITHIN $PROBE_TIMEOUT "on" volinfo_field_1 $vol1 performance.readdir-ahead - -vol_name=$(printf "%s-vol%02d" $V0 2) -EXPECT_WITHIN $PROBE_TIMEOUT "on" volinfo_field_1 $vol2 performance.readdir-ahead +done cleanup -- cgit