1*4882a593SmuzhiyunFrom 02a41c3fd560fb5250186dd6b3cff6b21daa2e2b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Mingli Yu <Mingli.Yu@windriver.com> 3*4882a593SmuzhiyunDate: Mon, 15 Jul 2019 14:12:24 +0800 4*4882a593SmuzhiyunSubject: [PATCH] Revert "tests: wait for complete rebuild in integrity checks" 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis reverts commit e2a8e9dcf67a28bc722fa5ab2c49b0bc452d4d74 7*4882a593Smuzhiyunas the logic "check state 'U*'" will make the test enters 8*4882a593Smuzhiyuninfinite loop especially in qemu env, so revert it to 9*4882a593Smuzhiyunuse the previous logic "check wait" which also used 10*4882a593Smuzhiyuncommonly by other tests such as tests/02r5grow, tests/07revert-grow 11*4882a593Smuzhiyunand etc. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunUpstream-Status: Submitted [https://marc.info/?l=linux-raid&m=156317157314030&w=2] 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Mingli Yu <Mingli.Yu@windriver.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun tests/01r5integ | 2 +- 18*4882a593Smuzhiyun tests/01raid6integ | 4 ++-- 19*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 3 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/tests/01r5integ b/tests/01r5integ 22*4882a593Smuzhiyunindex 48676a2..ffb30ce 100644 23*4882a593Smuzhiyun--- a/tests/01r5integ 24*4882a593Smuzhiyun+++ b/tests/01r5integ 25*4882a593Smuzhiyun@@ -27,7 +27,7 @@ do 26*4882a593Smuzhiyun exit 1 27*4882a593Smuzhiyun fi 28*4882a593Smuzhiyun mdadm $md0 -a $i 29*4882a593Smuzhiyun- while ! (check state 'U*'); do check wait; sleep 0.2; done 30*4882a593Smuzhiyun+ check wait 31*4882a593Smuzhiyun done 32*4882a593Smuzhiyun mdadm -S $md0 33*4882a593Smuzhiyun done 34*4882a593Smuzhiyundiff --git a/tests/01raid6integ b/tests/01raid6integ 35*4882a593Smuzhiyunindex 12f4d81..c6fcdae 100644 36*4882a593Smuzhiyun--- a/tests/01raid6integ 37*4882a593Smuzhiyun+++ b/tests/01raid6integ 38*4882a593Smuzhiyun@@ -47,10 +47,10 @@ do 39*4882a593Smuzhiyun exit 1 40*4882a593Smuzhiyun fi 41*4882a593Smuzhiyun mdadm $md0 -a $first 42*4882a593Smuzhiyun- while ! (check state 'U*_U*'); do check wait; sleep 0.2; done 43*4882a593Smuzhiyun+ check wait 44*4882a593Smuzhiyun done 45*4882a593Smuzhiyun mdadm $md0 -a $second 46*4882a593Smuzhiyun- while ! (check state 'U*'); do check wait; sleep 0.2; done 47*4882a593Smuzhiyun+ check wait 48*4882a593Smuzhiyun totest="$totest $second" 49*4882a593Smuzhiyun done 50*4882a593Smuzhiyun mdadm -S $md0 51*4882a593Smuzhiyun-- 52*4882a593Smuzhiyun2.7.4 53*4882a593Smuzhiyun 54