summaryrefslogtreecommitdiffstats
path: root/ChangeLog
blob: 3b1c49301239285840ef0b6cbab329d16e821e8e (plain)
1
ChangeLog is maintained by "git log".
lue='8'>8space:mode:
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/glusterd-restart-shd-mux.t10
-rw-r--r--tests/basic/multiple-volume-shd-mux.t8
-rw-r--r--tests/basic/shd-mux-afr.t4
-rw-r--r--tests/basic/shd-mux-ec.t8
-rw-r--r--tests/basic/volume-scale-shd-mux.t28
5 files changed, 28 insertions, 30 deletions
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 volu