diff options
author | Mateusz Kusiak <mateusz.kusiak@intel.com> | 2024-12-12 14:41:40 +0100 |
---|---|---|
committer | Mariusz Tkaczyk <mtkaczyk@kernel.org> | 2024-12-13 10:08:10 +0100 |
commit | d4be82f360160b4c8468fc35c0f9eb2803c7d739 (patch) | |
tree | 4694ce1322b394281a96c33f2570ccadf2465435 | |
parent | tests: fix 01r5fail (diff) | |
download | mdadm-d4be82f360160b4c8468fc35c0f9eb2803c7d739.tar.xz mdadm-d4be82f360160b4c8468fc35c0f9eb2803c7d739.zip |
tests: increase sleeps for 04r5swap and 05r tests
This commit increases sleep times from 4 seconds to 6 as some of the
tests seem to be randomly failing due to this.
Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
-rw-r--r-- | tests/04r5swap | 2 | ||||
-rw-r--r-- | tests/05r1-grow-internal | 4 | ||||
-rw-r--r-- | tests/05r1-grow-internal-1 | 4 | ||||
-rw-r--r-- | tests/05r1-internalbitmap | 6 | ||||
-rw-r--r-- | tests/05r1-internalbitmap-v1a | 6 | ||||
-rw-r--r-- | tests/05r1-internalbitmap-v1b | 6 | ||||
-rw-r--r-- | tests/05r1-internalbitmap-v1c | 6 | ||||
-rw-r--r-- | tests/05r1-re-add | 2 | ||||
-rw-r--r-- | tests/05r1-re-add-nosuper | 2 | ||||
-rw-r--r-- | tests/05r5-internalbitmap | 6 |
10 files changed, 22 insertions, 22 deletions
diff --git a/tests/04r5swap b/tests/04r5swap index 5373a607..e5f76ea8 100644 --- a/tests/04r5swap +++ b/tests/04r5swap @@ -2,7 +2,7 @@ # make a raid5 array, byte swap the superblocks, then assemble... mdadm -CR $md0 -e 0.90 -l5 -n4 $dev0 $dev1 $dev2 $dev3 -sleep 4 +sleep 6 mdadm -S $md0 mdadm -E --metadata=0 $dev1 > $targetdir/d1 diff --git a/tests/05r1-grow-internal b/tests/05r1-grow-internal index f7fff989..6e2dac2a 100644 --- a/tests/05r1-grow-internal +++ b/tests/05r1-grow-internal @@ -8,11 +8,11 @@ testdev $md0 1 $mdsize1a 64 #mdadm -E $dev1 mdadm --grow $md0 --bitmap=internal --bitmap-chunk=4 --delay=1 || { mdadm -X $dev2 ; exit 1; } -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` testdev $md0 1 $mdsize1a 64 -sleep 4 +sleep 6 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 -o $dirty2 -ne 0 ] diff --git a/tests/05r1-grow-internal-1 b/tests/05r1-grow-internal-1 index f0f8349f..c88533f9 100644 --- a/tests/05r1-grow-internal-1 +++ b/tests/05r1-grow-internal-1 @@ -8,11 +8,11 @@ testdev $md0 1 $mdsize1b 64 #mdadm -E $dev1 mdadm --grow $md0 --bitmap=internal --bitmap-chunk=4 --delay=1 -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` testdev $md0 1 $mdsize1b 64 -sleep 4 +sleep 6 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 -o $dirty2 -ne 0 ] diff --git a/tests/05r1-internalbitmap b/tests/05r1-internalbitmap index f1a2843e..401c5d2f 100644 --- a/tests/05r1-internalbitmap +++ b/tests/05r1-internalbitmap @@ -9,7 +9,7 @@ mdadm -S $md0 mdadm --assemble $md0 $dev1 $dev2 testdev $md0 1 $mdsize0 64 -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 ] @@ -18,7 +18,7 @@ then echo >&2 "ERROR bad 'dirty' counts: $dirty1" fi mdadm $md0 -f $dev1 testdev $md0 1 $mdsize0 64 -sleep 4 +sleep 6 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'` dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty2 -ne $total ] @@ -34,7 +34,7 @@ mdadm $md0 --add $dev1 check recovery check wait -sleep 4 +sleep 6 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty3 -ne 0 ] diff --git a/tests/05r1-internalbitmap-v1a b/tests/05r1-internalbitmap-v1a index cf3f3972..0b738b58 100644 --- a/tests/05r1-internalbitmap-v1a +++ b/tests/05r1-internalbitmap-v1a @@ -10,7 +10,7 @@ mdadm -S $md0 mdadm --assemble $md0 $dev1 $dev2 testdev $md0 1 $mdsize1b 64 -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 ] @@ -19,7 +19,7 @@ then echo >&2 "ERROR bad 'dirty' counts: $dirty1" fi mdadm $md0 -f $dev1 testdev $md0 1 $mdsize1b 64 -sleep 4 +sleep 6 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'` dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty2 -ne $total ] @@ -35,7 +35,7 @@ mdadm $md0 --add $dev1 check recovery check wait -sleep 4 +sleep 6 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty3 -ne 0 ] diff --git a/tests/05r1-internalbitmap-v1b b/tests/05r1-internalbitmap-v1b index 4952887e..8999a50e 100644 --- a/tests/05r1-internalbitmap-v1b +++ b/tests/05r1-internalbitmap-v1b @@ -11,7 +11,7 @@ mdadm -S $md0 mdadm --assemble $md0 $dev1 $dev2 check bitmap testdev $md0 1 $mdsize11 64 -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 ] @@ -20,7 +20,7 @@ then echo >&2 "ERROR bad 'dirty' counts: $dirty1" fi mdadm $md0 -f $dev1 testdev $md0 1 $mdsize11 64 -sleep 4 +sleep 6 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'` dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty2 -ne $total ] @@ -35,7 +35,7 @@ mdadm --assemble -R $md0 $dev2 mdadm $md0 --add $dev1 check recovery check wait -sleep 4 +sleep 6 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty3 -ne 0 ] diff --git a/tests/05r1-internalbitmap-v1c b/tests/05r1-internalbitmap-v1c index e1e4472f..75203b4d 100644 --- a/tests/05r1-internalbitmap-v1c +++ b/tests/05r1-internalbitmap-v1c @@ -10,7 +10,7 @@ mdadm -S $md0 mdadm --assemble $md0 $dev1 $dev2 testdev $md0 1 $mdsize12 64 -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 ] @@ -19,7 +19,7 @@ then echo >&2 "ERROR bad 'dirty' counts: $dirty1" fi mdadm $md0 -f $dev1 testdev $md0 1 $mdsize12 64 -sleep 4 +sleep 6 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'` dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty2 -ne $total ] @@ -35,7 +35,7 @@ mdadm $md0 --add $dev1 check recovery check wait -sleep 4 +sleep 6 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty3 -ne 0 ] diff --git a/tests/05r1-re-add b/tests/05r1-re-add index fa6bbcb4..4fc263f5 100644 --- a/tests/05r1-re-add +++ b/tests/05r1-re-add @@ -9,7 +9,7 @@ mdadm -CR $md0 -l1 -n2 -binternal --bitmap-chunk=4 -d1 $dev1 $dev2 check resync check wait testdev $md0 1 $mdsize1a 64 -sleep 4 +sleep 6 mdadm $md0 -f $dev2 sleep 1 diff --git a/tests/05r1-re-add-nosuper b/tests/05r1-re-add-nosuper index a6ac6ed5..f243e4aa 100644 --- a/tests/05r1-re-add-nosuper +++ b/tests/05r1-re-add-nosuper @@ -7,7 +7,7 @@ sleep 1 check resync check wait testdev $md0 1 $size 1 -sleep 4 +sleep 6 mdadm $md0 -f $dev2 sleep 1 diff --git a/tests/05r5-internalbitmap b/tests/05r5-internalbitmap index 1a64482f..4264aa61 100644 --- a/tests/05r5-internalbitmap +++ b/tests/05r5-internalbitmap @@ -9,7 +9,7 @@ mdadm -S $md0 mdadm --assemble $md0 $dev1 $dev2 $dev3 testdev $md0 2 $mdsize1 512 -sleep 4 +sleep 6 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty1 -ne 0 ] @@ -18,7 +18,7 @@ then echo >&2 "ERROR bad 'dirty' counts: $dirty1" fi mdadm $md0 -f $dev1 testdev $md0 2 $mdsize1 512 -sleep 4 +sleep 6 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty2 -lt 400 ] then @@ -33,7 +33,7 @@ mdadm --zero $dev1 # force --add, not --re-add mdadm $md0 --add $dev1 check recovery check wait -sleep 4 +sleep 6 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'` if [ $dirty3 -ne 0 ] |