From 880e20ca967d0001e0b6d2780bece8b635a090eb Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Fri, 5 Jul 2019 09:09:44 +0530 Subject: tests: revive back volume-scale-shd-mux.t Fixes: bz#1708929 Change-Id: I9cc81a9047ff874df752ca5552e00bf033485bd8 Signed-off-by: Atin Mukherjee Signed-off-by: Mohammed Rafi KC --- tests/basic/glusterd-restart-shd-mux.t | 10 +++++----- tests/basic/multiple-volume-shd-mux.t | 8 ++++---- tests/basic/shd-mux-afr.t | 4 ++-- tests/basic/shd-mux-ec.t | 8 ++++---- tests/basic/volume-scale-shd-mux.t | 28 +++++++++++++--------------- 5 files changed, 28 insertions(+), 30 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/glusterd-restart-shd-mux.t b/tests/basic/glusterd-restart-shd-mux.t index a50af9dfa57..46d0dac2fce 100644 --- a/tests/basic/glusterd-restart-shd-mux.t +++ b/tests/basic/glusterd-restart-shd-mux.t @@ -31,9 +31,9 @@ EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^1$" shd_count TEST glusterd EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count #Check the thread count become to number of volumes*number of ec subvolume (3*6=18) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "ec_shd_index_healer" #Check the thread count become to number of volumes*number of afr subvolume (4*6=24) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^24$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^24$" number_healer_threads_shd $V0 "afr_shd_index_healer" shd_pid=$(get_shd_mux_pid $V0) for i in $(seq 1 3); do @@ -52,9 +52,9 @@ TEST glusterd EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count #Check the thread count become to number of volumes*number of ec subvolume (3*6=18) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "ec_shd_index_healer" #Check the thread count become to number of volumes*number of afr subvolume (4*6=24) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^24$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^24$" number_healer_threads_shd $V0 "afr_shd_index_healer" shd_pid=$(get_shd_mux_pid $V0) for i in $(seq 1 3); do @@ -69,7 +69,7 @@ for i in $(seq 1 3); do TEST $CLI volume stop ${V0}_ec$i done -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 diff --git a/tests/basic/multiple-volume-shd-mux.t b/tests/basic/multiple-volume-shd-mux.t index 0627dea48f6..d7cfbaec85f 100644 --- a/tests/basic/multiple-volume-shd-mux.t +++ b/tests/basic/multiple-volume-shd-mux.t @@ -13,7 +13,7 @@ TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2,3,4,5} TEST $CLI volume start $V0 shd_pid=$(get_shd_mux_pid $V0) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" for i in $(seq 1 3); do TEST $CLI volume create ${V0}_afr$i replica 3 $H0:$B0/${V0}_afr${i}{0,1,2,3,4,5} @@ -23,9 +23,9 @@ for i in $(seq 1 3); do done #Check the thread count become to number of volumes*number of ec subvolume (3*6=18) -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^18$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^18$" number_healer_threads_shd $V0 "ec_shd_index_healer" #Check the thread count become to number of volumes*number of afr subvolume (4*6=24) -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^24$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^24$" number_healer_threads_shd $V0 "afr_shd_index_healer" #Delete the volumes for i in $(seq 1 3); do TEST $CLI volume stop ${V0}_afr$i @@ -37,7 +37,7 @@ done EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^${shd_pid}$" get_shd_mux_pid $V0 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" TEST $CLI volume stop ${V0} TEST $CLI volume delete ${V0} diff --git a/tests/basic/shd-mux-afr.t b/tests/basic/shd-mux-afr.t index 8642be9e4fd..cf300c148bb 100644 --- a/tests/basic/shd-mux-afr.t +++ b/tests/basic/shd-mux-afr.t @@ -15,7 +15,7 @@ TEST $CLI volume start $V0 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 shd_pid=$(get_shd_mux_pid $V0) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" #Create a one more volume TEST $CLI volume create ${V0}_1 replica 3 $H0:$B0/${V0}_1{0,1,2,3,4,5} @@ -62,7 +62,7 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^${shd_pid}$" get_shd_mux_pid $V0 #Check the thread count become to earlier number after stopping -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" TEST $CLI volume stop ${V0} TEST $CLI volume delete ${V0} diff --git a/tests/basic/shd-mux-ec.t b/tests/basic/shd-mux-ec.t index 5ab84736cec..ef4d65018d3 100644 --- a/tests/basic/shd-mux-ec.t +++ b/tests/basic/shd-mux-ec.t @@ -15,7 +15,7 @@ TEST $CLI volume start $V0 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 shd_pid=$(get_shd_mux_pid $V0) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" #Now create a ec volume and check mux works TEST $CLI volume create ${V0}_2 disperse 6 redundancy 2 $H0:$B0/${V0}_2{0,1,2,3,4,5} @@ -45,7 +45,7 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^404$" get_pending_heal_count ${V0}_2 TEST $CLI volume start ${V0} force TEST $CLI volume start ${V0}_2 force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "ec_shd_index_healer" EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count ${V0}_2 @@ -64,9 +64,9 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^${shd_pid}$" get_shd_mux_pid $V0 #Check the thread count become to zero for ec related threads -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^0$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^0$" number_healer_threads_shd $V0 "ec_shd_index_healer" #Check the thread count become to earlier number after stopping -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" TEST $CLI volume stop ${V0} TEST $CLI volume delete ${V0} diff --git a/tests/basic/volume-scale-shd-mux.t b/tests/basic/volume-scale-shd-mux.t index d1ddcbca7dd..01746327d91 100644 --- a/tests/basic/volume-scale-shd-mux.t +++ b/tests/basic/volume-scale-shd-mux.t @@ -24,31 +24,31 @@ done EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count #Check the thread count become to number of volumes*number of ec subvolume (2*6=12) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^12$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^12$" number_healer_threads_shd $V0 "ec_shd_index_healer" #Check the thread count become to number of volumes*number of afr subvolume (3*6=18) -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "afr_shd_index_healer" TEST $CLI volume add-brick $V0 replica 3 $H0:$B0/${V0}{6,7,8}; #Check the thread count become to number of volumes*number of afr subvolume plus 3 additional threads from newly added bricks (3*6+3=21) EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^21$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^21$" number_healer_threads_shd $V0 "afr_shd_index_healer" #Remove the brick and check the detach is successful $CLI volume remove-brick $V0 $H0:$B0/${V0}{6,7,8} force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "afr_shd_index_healer" EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^0$" number_healer_threads_shd $V0 "glusterfs_graph_cleanup" TEST $CLI volume add-brick ${V0}_ec1 $H0:$B0/${V0}_ec1_add{0,1,2,3,4,5}; #Check the thread count become to number of volumes*number of ec subvolume plus 2 additional threads from newly added bricks (2*6+6=18) EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^18$" number_healer_threads_shd $V0 "ec_shd_index_healer" #Remove the brick and check the detach is successful $CLI volume remove-brick ${V0}_ec1 $H0:$B0/${V0}_ec1_add{0,1,2,3,4,5} force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^12$" number_healer_threads_shd $V0 "__ec_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^12$" number_healer_threads_shd $V0 "ec_shd_index_healer" for i in $(seq 1 2); do @@ -56,7 +56,7 @@ for i in $(seq 1 2); do TEST $CLI volume stop ${V0}_ec$i done -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 @@ -78,17 +78,17 @@ TEST $CLI volume create ${V0}_distribute1 $H0:$B0/${V0}_distribute10 TEST $CLI volume start ${V0}_distribute1 #Creating a non-replicate/non-ec volume should not have any effect in shd -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" EXPECT "^${shd_pid}$" get_shd_mux_pid $V0 TEST mkdir $B0/add/ #Now convert the distributed volume to replicate TEST $CLI volume add-brick ${V0}_distribute1 replica 3 $H0:$B0/add/{2..3} -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^9$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^9$" number_healer_threads_shd $V0 "afr_shd_index_healer" #scale down the volume TEST $CLI volume remove-brick ${V0}_distribute1 replica 1 $H0:$B0/add/{2..3} force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "__afr_shd_healer_wait" +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^6$" number_healer_threads_shd $V0 "afr_shd_index_healer" #Before stopping the process, make sure there is no pending clenup threads hanging EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^0$" number_healer_threads_shd $V0 "glusterfs_graph_cleanup" @@ -97,12 +97,12 @@ TEST $CLI volume stop ${V0} TEST $CLI volume delete ${V0} EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^0$" shd_count -TEST rm -rf $B0/add/ -TEST mkdir $B0/add/ +TEST rm -rf $B0/add/2 $B0/add/3 + #Now convert the distributed volume back to replicate and make sure that a new shd is spawned TEST $CLI volume add-brick ${V0}_distribute1 replica 3 $H0:$B0/add/{2..3}; EXPECT_WITHIN $PROCESS_UP_TIMEOUT "^1$" shd_count -EXPECT_WITHIN $HEAL_TIMEOUT "^3$" number_healer_threads_shd ${V0}_distribute1 "__afr_shd_healer_wait" +EXPECT_WITHIN $HEAL_TIMEOUT "^3$" number_healer_threads_shd ${V0}_distribute1 "afr_shd_index_healer" #Now convert the replica volume to distribute again and make sure the shd is now stopped TEST $CLI volume remove-brick ${V0}_distribute1 replica 1 $H0:$B0/add/{2..3} force @@ -112,5 +112,3 @@ EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "^0$" shd_count cleanup -#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=1708929 -#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=1708929 -- cgit