From e510f55bed6c26c6b995e7d9f3c35e1e4e482769 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Sat, 11 May 2019 22:40:22 +0530 Subject: glusterfsd/cleanup: Protect graph object under a lock While processing a cleanup_and_exit function, we are accessing a graph object. But this has not been protected under a lock. Because a parallel cleanup of a graph is quite possible which might lead to an invalid memory access Change-Id: Id05ca70d5b57e172b0401d07b6a1f5386c044e79 fixes: bz#1708926 Signed-off-by: Mohammed Rafi KC --- tests/bugs/glusterd/optimized-basic-testcases.t | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t index d700b5ed5af..110f1b92dae 100644 --- a/tests/bugs/glusterd/optimized-basic-testcases.t +++ b/tests/bugs/glusterd/optimized-basic-testcases.t @@ -289,7 +289,9 @@ mkdir -p /xyz/var/lib/glusterd/abc TEST $CLI volume create "test" $H0:/xyz/var/lib/glusterd/abc EXPECT 'Created' volinfo_field "test" 'Status'; -EXPECT "1" generate_statedump_and_check_for_glusterd_info +#While taking a statedump, there is a TRY_LOCK on call_frame, which might may cause +#failure. So Adding a EXPECT_WITHIN +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" generate_statedump_and_check_for_glusterd_info cleanup_statedump `pidof glusterd` cleanup -- cgit