69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
|
From 7664a3851476cfcda931d35f495d03f51707bac9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xiao Ni <xni@redhat.com>
|
||
|
|
Date: Wed, 22 May 2024 16:50:50 +0800
|
||
|
|
Subject: [PATCH 088/201] mdadm/tests: 05r5-internalbitmap
|
||
|
|
|
||
|
|
It's not right to compare bitmap bits with a number after io comes.
|
||
|
|
Because maybe those bits are already flused. Remove the related
|
||
|
|
tests.
|
||
|
|
|
||
|
|
Signed-off-by: Xiao Ni <xni@redhat.com>
|
||
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
---
|
||
|
|
tests/05r5-internalbitmap | 21 +++++++++------------
|
||
|
|
1 file changed, 9 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/05r5-internalbitmap b/tests/05r5-internalbitmap
|
||
|
|
index 13dc5921..1a64482f 100644
|
||
|
|
--- a/tests/05r5-internalbitmap
|
||
|
|
+++ b/tests/05r5-internalbitmap
|
||
|
|
@@ -9,21 +9,20 @@ mdadm -S $md0
|
||
|
|
|
||
|
|
mdadm --assemble $md0 $dev1 $dev2 $dev3
|
||
|
|
testdev $md0 2 $mdsize1 512
|
||
|
|
-dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
sleep 4
|
||
|
|
-dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
+dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
|
||
|
|
-if [ $dirty1 -lt 400 -o $dirty2 -ne 0 ]
|
||
|
|
-then echo >&2 "ERROR bad 'dirty' counts: $dirty1 and $dirty2"
|
||
|
|
+if [ $dirty1 -ne 0 ]
|
||
|
|
+then echo >&2 "ERROR bad 'dirty' counts: $dirty1"
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
mdadm $md0 -f $dev1
|
||
|
|
testdev $md0 2 $mdsize1 512
|
||
|
|
sleep 4
|
||
|
|
-dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
-if [ $dirty3 -lt 400 ]
|
||
|
|
+dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
+if [ $dirty2 -lt 400 ]
|
||
|
|
then
|
||
|
|
- echo >&2 "ERROR dirty count $dirty3 is too small"
|
||
|
|
+ echo >&2 "ERROR dirty count $dirty2 is too small"
|
||
|
|
exit 2
|
||
|
|
fi
|
||
|
|
|
||
|
|
@@ -33,14 +32,12 @@ mdadm --assemble -R $md0 $dev2 $dev3
|
||
|
|
mdadm --zero $dev1 # force --add, not --re-add
|
||
|
|
mdadm $md0 --add $dev1
|
||
|
|
check recovery
|
||
|
|
-
|
||
|
|
-dirty4=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
check wait
|
||
|
|
sleep 4
|
||
|
|
-dirty5=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
+dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
|
||
|
|
|
||
|
|
-if [ $dirty4 -lt 400 -o $dirty5 -ne 0 ]
|
||
|
|
-then echo echo >&2 "ERROR bad 'dirty' counts at end: $dirty4 $dirty5"
|
||
|
|
+if [ $dirty3 -ne 0 ]
|
||
|
|
+then echo echo >&2 "ERROR bad 'dirty' counts at end: $dirty3"
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|