common/fuzzy: adapt the scrub stress tests to support rtgroups

Adapt the scrub stress testing framework to support checking realtime
group metadata.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/common/fuzzy b/common/fuzzy
index ceb547669b51cde4624ffe58f469d1754b053359..254426be6c8cf9b879488304bf5265021b6fac25 100644 (file)
--- a/common/fuzzy
+++ b/common/fuzzy
@@ -829,8 +829,10 @@ __stress_one_scrub_loop() {
        local scrub_tgt="$3"
        local scrub_startat="$4"
        local start_agno="$5"
-       shift; shift; shift; shift; shift
+       local start_rgno="$6"
+       shift; shift; shift; shift; shift; shift
        local agcount="$(_xfs_mount_agcount $SCRATCH_MNT)"
+       local rgcount="$(_xfs_mount_rgcount $SCRATCH_MNT)"
 
        local xfs_io_args=()
        for arg in "$@"; do
@@ -843,6 +845,12 @@ __stress_one_scrub_loop() {
                                local ag_arg="$(echo "$arg" | sed -e "s|%agno%|$agno|g")"
                                xfs_io_args+=('-c' "$ag_arg")
                        done
+               elif echo "$arg" | grep -q -w '%rgno%'; then
+                       # Substitute the rtgroup number
+                       for ((rgno = start_rgno; rgno < rgcount; rgno++)); do
+                               local rg_arg="$(echo "$arg" | sed -e "s|%rgno%|$rgno|g")"
+                               xfs_io_args+=('-c' "$rg_arg")
+                       done
                else
                        xfs_io_args+=('-c' "$arg")
                fi
@@ -1259,7 +1267,9 @@ _scratch_xfs_stress_scrub_cleanup() {
 __stress_scrub_check_commands() {
        local scrub_tgt="$1"
        local start_agno="$2"
-       shift; shift
+       local start_rgno="$3"
+       shift; shift; shift
+       local rgcount="$(_xfs_mount_rgcount $SCRATCH_MNT)"
 
        local cooked_tgt="$scrub_tgt"
        case "$scrub_tgt" in
@@ -1289,6 +1299,10 @@ __stress_scrub_check_commands() {
                        cooked_arg="$(echo "$cooked_arg" | sed -e 's/^repair/repair -R/g')"
                fi
                cooked_arg="$(echo "$cooked_arg" | sed -e "s/%agno%/$start_agno/g")"
+               if echo "$cooked_arg" | grep -q -w '%rgno%'; then
+                       test "$rgcount" -eq 0 && continue
+                       cooked_arg="$(echo "$cooked_arg" | sed -e "s/%rgno%/$start_rgno/g")"
+               fi
                testio=`$XFS_IO_PROG -x -c "$cooked_arg" "$cooked_tgt" 2>&1`
                echo $testio | grep -q "Unknown type" && \
                        _notrun "xfs_io scrub subcommand support is missing"
@@ -1314,6 +1328,7 @@ __stress_scrub_check_commands() {
 #      in a separate loop.  If zero -i options are specified, do not run.
 #      Callers must check each of these commands (via _require_xfs_io_command)
 #      before calling here.
+# -R   For %rgno% substitution, start with this rtgroup instead of rtgroup 0.
 # -r   Run fsstress for this amount of time, then remount the fs ro or rw.
 #      The default is to run fsstress continuously with no remount, unless
 #      XFS_SCRUB_STRESS_REMOUNT_PERIOD is set.
@@ -1360,6 +1375,7 @@ _scratch_xfs_stress_scrub() {
        local remount_period="${XFS_SCRUB_STRESS_REMOUNT_PERIOD}"
        local stress_tgt="${XFS_SCRUB_STRESS_TARGET:-default}"
        local start_agno=0
+       local start_rgno=0
 
        __SCRUB_STRESS_FREEZE_PID=""
        __SCRUB_STRESS_REMOUNT_LOOP=""
@@ -1367,12 +1383,13 @@ _scratch_xfs_stress_scrub() {
        touch "$runningfile"
 
        OPTIND=1
-       while getopts "a:fi:r:s:S:t:w:x:X:" c; do
+       while getopts "a:fi:r:R:s:S:t:w:x:X:" c; do
                case "$c" in
                        a) start_agno="$OPTARG";;
                        f) freeze=yes;;
                        i) io_args+=("$OPTARG");;
                        r) remount_period="$OPTARG";;
+                       R) start_rgno="$OPTARG";;
                        s) one_scrub_args+=("$OPTARG");;
                        S) xfs_scrub_args+=("$OPTARG");;
                        t) scrub_tgt="$OPTARG";;
@@ -1383,7 +1400,7 @@ _scratch_xfs_stress_scrub() {
                esac
        done
 
-       __stress_scrub_check_commands "$scrub_tgt" "$start_agno" \
+       __stress_scrub_check_commands "$scrub_tgt" "$start_agno" "$start_rgno" \
                        "${one_scrub_args[@]}"
 
        if ! command -v "__stress_scrub_${exerciser}_loop" &>/dev/null; then
@@ -1439,7 +1456,7 @@ _scratch_xfs_stress_scrub() {
 
        if [ "${#one_scrub_args[@]}" -gt 0 ]; then
                __stress_one_scrub_loop "$end" "$runningfile" "$scrub_tgt" \
-                               "$scrub_startat" "$start_agno" \
+                               "$scrub_startat" "$start_agno" "$start_rgno" \
                                "${one_scrub_args[@]}" &
        fi
 

diff --git a/common/xfs b/common/xfs
index 95bc49f65efb248612090b9b430f752f70c34135..3bb0ba43cf9221ee86dae2341f20dfb25c4d29d2 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -1480,6 +1480,15 @@ _xfs_mount_agcount()
        $XFS_INFO_PROG "$1" | sed -n "s/^.*agcount=\([[:digit:]]*\).*/\1/p"
 }
 
+# Find rtgroup count of mounted filesystem
+_xfs_mount_rgcount()
+{
+       local rtgroups="$($XFS_INFO_PROG "$1" | grep rgcount= | sed -e 's/^.*rgcount=\([0-9]*\).*$/\1/g')"
+
+       test -z "$rtgroups" && rtgroups=0
+       echo "$rtgroups"
+}
+
 # Wipe the superblock of each XFS AGs
 _try_wipe_scratch_xfs()
 {

diff --git a/tests/xfs/581 b/tests/xfs/581
index 73b51f994a3f00b7cd0e96c437c2ae580b85e45c..3af9ef8a19c0bb21fd4daf2987a134a2efb69943 100755 (executable)
--- a/tests/xfs/581
+++ b/tests/xfs/581
@@ -30,7 +30,7 @@ _require_xfs_stress_scrub
 _scratch_mkfs > "$seqres.full" 2>&1
 _scratch_mount
 _require_xfs_has_feature "$SCRATCH_MNT" realtime
-_scratch_xfs_stress_scrub -s "scrub rtbitmap"
+_scratch_xfs_stress_scrub -s "scrub rtbitmap"  -s "scrub rgbitmap %rgno%"
 
 # success, all done
 echo Silence is golden

diff --git a/tests/xfs/720 b/tests/xfs/720
index f928cc43d3bc54221482dc0b4acdd91bc8bb8f70..e4af2a8d5470d2eec42d9ba427c5df58eec58305 100755 (executable)
--- a/tests/xfs/720
+++ b/tests/xfs/720
@@ -37,7 +37,7 @@ alloc_unit=$(_get_file_block_size $SCRATCH_MNT)
 scratchfile=$SCRATCH_MNT/file
 touch $scratchfile
 $XFS_IO_PROG -x -c 'inject force_repair' $SCRATCH_MNT
-__stress_scrub_check_commands "$scratchfile" "" 'repair bmapbtd'
+__stress_scrub_check_commands "$scratchfile" "" "" 'repair bmapbtd'
 
 # Compute the number of extent records needed to guarantee btree format,
 # assuming 16 bytes for each ondisk extent record

diff --git a/tests/xfs/795 b/tests/xfs/795
index 5a67f02ec92eca02b68221e64f926652e165bb6e..cd1d288add212f196a452de426ffeace05110236 100755 (executable)
--- a/tests/xfs/795
+++ b/tests/xfs/795
@@ -37,7 +37,7 @@ scratchfile=$SCRATCH_MNT/file
 mkdir $scratchdir
 touch $scratchfile
 $XFS_IO_PROG -x -c 'inject force_repair' $SCRATCH_MNT
-__stress_scrub_check_commands "$scratchdir" "" 'repair directory'
+__stress_scrub_check_commands "$scratchdir" "" "" 'repair directory'
 
 # Create a 2-dirblock directory
 total_size=$((alloc_unit * 2))