54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 02a41c3fd560fb5250186dd6b3cff6b21daa2e2b Mon Sep 17 00:00:00 2001
|
|
From: Mingli Yu <Mingli.Yu@windriver.com>
|
|
Date: Mon, 15 Jul 2019 14:12:24 +0800
|
|
Subject: [PATCH] Revert "tests: wait for complete rebuild in integrity checks"
|
|
|
|
This reverts commit e2a8e9dcf67a28bc722fa5ab2c49b0bc452d4d74
|
|
as the logic "check state 'U*'" will make the test enters
|
|
infinite loop especially in qemu env, so revert it to
|
|
use the previous logic "check wait" which also used
|
|
commonly by other tests such as tests/02r5grow, tests/07revert-grow
|
|
and etc.
|
|
|
|
Upstream-Status: Submitted [https://marc.info/?l=linux-raid&m=156317157314030&w=2]
|
|
|
|
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
|
|
---
|
|
tests/01r5integ | 2 +-
|
|
tests/01raid6integ | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/01r5integ b/tests/01r5integ
|
|
index 48676a2..ffb30ce 100644
|
|
--- a/tests/01r5integ
|
|
+++ b/tests/01r5integ
|
|
@@ -27,7 +27,7 @@ do
|
|
exit 1
|
|
fi
|
|
mdadm $md0 -a $i
|
|
- while ! (check state 'U*'); do check wait; sleep 0.2; done
|
|
+ check wait
|
|
done
|
|
mdadm -S $md0
|
|
done
|
|
diff --git a/tests/01raid6integ b/tests/01raid6integ
|
|
index 12f4d81..c6fcdae 100644
|
|
--- a/tests/01raid6integ
|
|
+++ b/tests/01raid6integ
|
|
@@ -47,10 +47,10 @@ do
|
|
exit 1
|
|
fi
|
|
mdadm $md0 -a $first
|
|
- while ! (check state 'U*_U*'); do check wait; sleep 0.2; done
|
|
+ check wait
|
|
done
|
|
mdadm $md0 -a $second
|
|
- while ! (check state 'U*'); do check wait; sleep 0.2; done
|
|
+ check wait
|
|
totest="$totest $second"
|
|
done
|
|
mdadm -S $md0
|
|
--
|
|
2.7.4
|
|
|