82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
|
From bde21cc929d4864bd4b9f459f46ce63dd8c793ca Mon Sep 17 00:00:00 2001
|
||
|
|
From: Heming Zhao <heming.zhao@suse.com>
|
||
|
|
Date: Tue, 9 Jul 2024 20:04:52 +0800
|
||
|
|
Subject: [PATCH 118/157] mdadm/clustermd_tests: adjust test cases to support
|
||
|
|
md module changes
|
||
|
|
|
||
|
|
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 can happen on any leg of the array. This
|
||
|
|
commit adjusts the test cases to follow the new kernel layer behavior.
|
||
|
|
|
||
|
|
Signed-off-by: Heming Zhao <heming.zhao@suse.com>
|
||
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
---
|
||
|
|
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 2288a008..d8764667 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 d0d13e53..811df87b 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 867388d0..7d0b8812 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 a1a7cbe7..d8483c45 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.41.0
|
||
|
|
|