[heming: Please note, this commit for test my kernel patch, it's not the
final version.]
Since kernel commit db5e653d7c9f ("md: delay choosing sync action to
md_start_sync()") delays the start of the sync action, clustermd
array sync/resync jobs could happen on any leg of the array. This
commit adjusts test cases to follow the new kernel layer behavior.
Signed-off-by: Heming Zhao <heming.zhao@xxxxxxxx>
---
clustermd_tests/02r10_Manage_re-add | 3 ++-
clustermd_tests/02r1_Manage_re-add | 1 +
clustermd_tests/03r10_switch-recovery | 4 ++--
clustermd_tests/03r1_switch-recovery | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/clustermd_tests/02r10_Manage_re-add b/clustermd_tests/02r10_Manage_re-add
index 2288a00866bd..d8764667ca83 100644
--- a/clustermd_tests/02r10_Manage_re-add
+++ b/clustermd_tests/02r10_Manage_re-add
@@ -9,7 +9,8 @@ check all state UU
check all dmesg
mdadm --manage $md0 --fail $dev0 --remove $dev0
mdadm --manage $md0 --re-add $dev0
-check $NODE1 recovery
+#non-clustered array also doesn't do sync job
+#check $NODE1 recovery
check all wait
check all state UU
check all dmesg
diff --git a/clustermd_tests/02r1_Manage_re-add b/clustermd_tests/02r1_Manage_re-add
index d0d13e53fc0c..811df87be81e 100644
--- a/clustermd_tests/02r1_Manage_re-add
+++ b/clustermd_tests/02r1_Manage_re-add
@@ -9,6 +9,7 @@ check all state UU
check all dmesg
mdadm --manage $md0 --fail $dev0 --remove $dev0
mdadm --manage $md0 --re-add $dev0
+check all wait
check all state UU
check all dmesg
stop_md all $md0
diff --git a/clustermd_tests/03r10_switch-recovery b/clustermd_tests/03r10_switch-recovery
index 867388d04ad8..7d0b88125f46 100644
--- a/clustermd_tests/03r10_switch-recovery
+++ b/clustermd_tests/03r10_switch-recovery
@@ -10,9 +10,9 @@ check all state UU
check all dmesg
mdadm --manage $md0 --fail $dev0
sleep 0.2
-check $NODE1 recovery
+check $NODE1 recovery-remote
stop_md $NODE1 $md0
-check $NODE2 recovery
+check $NODE2 recovery-remote
check $NODE2 wait
check $NODE2 state UU
check all dmesg
diff --git a/clustermd_tests/03r1_switch-recovery b/clustermd_tests/03r1_switch-recovery
index a1a7cbe71b66..d8483c458297 100644
--- a/clustermd_tests/03r1_switch-recovery
+++ b/clustermd_tests/03r1_switch-recovery
@@ -10,9 +10,9 @@ check all state UU
check all dmesg
mdadm --manage $md0 --fail $dev0
sleep 0.3
-check $NODE1 recovery
+check $NODE1 recovery-remote
stop_md $NODE1 $md0
-check $NODE2 recovery
+check $NODE2 recovery-remote
check $NODE2 wait
check $NODE2 state UU
check all dmesg
--
2.35.3
