xfs: Add support for testing metadump v2

This commit adds the ability to test metadump v2 to existing metadump tests.

Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/xfs/129 b/tests/xfs/129
index 6f2ef5640d8fc677d7f78e5fd05920964facf2b2..8a817b416c7c7045a33479e1da5ef542584c3da0 100755 (executable)
--- a/tests/xfs/129
+++ b/tests/xfs/129
@@ -16,7 +16,11 @@ _cleanup()
 {
     cd /
     _scratch_unmount > /dev/null 2>&1
-    rm -rf $tmp.* $testdir $metadump_file $TEST_DIR/image
+    [[ -n $logdev && $logdev != "none" && $logdev != $SCRATCH_LOGDEV ]] && \
+           _destroy_loop_device $logdev
+    [[ -n $datadev ]] && _destroy_loop_device $datadev
+    rm -rf $tmp.* $testdir $metadump_file $TEST_DIR/data-image \
+       $TEST_DIR/log-image
 }
 
 # Import common functions.
@@ -29,12 +33,86 @@ _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_loop
 _require_scratch_reflink
 
+metadump_file=$TEST_DIR/${seq}_metadump
+
+verify_metadump_v1()
+{
+       local max_version=$1
+       local version=""
+
+       if [[ $max_version == 2 ]]; then
+               version="-v 1"
+       fi
+
+       _scratch_xfs_metadump $metadump_file $version
+
+       SCRATCH_DEV=$TEST_DIR/data-image SCRATCH_LOGDEV="" \
+                  _scratch_xfs_mdrestore $metadump_file
+
+       datadev=$(_create_loop_device $TEST_DIR/data-image)
+
+       SCRATCH_DEV=$datadev _scratch_mount
+       SCRATCH_DEV=$datadev _scratch_unmount
+
+       logdev=$SCRATCH_LOGDEV
+       [[ -z $logdev ]] && logdev=none
+       _check_xfs_filesystem $datadev $logdev none
+
+       _destroy_loop_device $datadev
+       datadev=""
+       rm -f $TEST_DIR/data-image
+}
+
+verify_metadump_v2()
+{
+       version="-v 2"
+
+       _scratch_xfs_metadump $metadump_file $version
+
+       # Metadump v2 files can contain contents dumped from an external log
+       # device. Use a temporary file to hold the log device contents restored
+       # from such a metadump file.
+       slogdev=""
+       if [[ -n $SCRATCH_LOGDEV ]]; then
+               slogdev=$TEST_DIR/log-image
+       fi
+
+       SCRATCH_DEV=$TEST_DIR/data-image SCRATCH_LOGDEV=$slogdev \
+                  _scratch_xfs_mdrestore $metadump_file
+
+       datadev=$(_create_loop_device $TEST_DIR/data-image)
+
+       logdev=${SCRATCH_LOGDEV}
+       if [[ -s $TEST_DIR/log-image ]]; then
+               logdev=$(_create_loop_device $TEST_DIR/log-image)
+       fi
+
+       SCRATCH_DEV=$datadev SCRATCH_LOGDEV=$logdev _scratch_mount
+       SCRATCH_DEV=$datadev SCRATCH_LOGDEV=$logdev _scratch_unmount
+
+       [[ -z $logdev ]] && logdev=none
+       _check_xfs_filesystem $datadev $logdev none
+
+       if [[ -s $TEST_DIR/log-image ]]; then
+               _destroy_loop_device $logdev
+               logdev=""
+               rm -f $TEST_DIR/log-image
+       fi
+
+       _destroy_loop_device $datadev
+       datadev=""
+       rm -f $TEST_DIR/data-image
+}
+
 _scratch_mkfs >/dev/null 2>&1
+
+max_md_version=1
+_scratch_metadump_v2_supported && max_md_version=2
+
 _scratch_mount
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
-metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"
 blksz="$(_get_file_block_size $testdir)"
@@ -47,18 +125,15 @@ seq 1 2 $((nr_blks - 1)) | while read nr; do
                        $testdir/file2 $((nr * blksz)) $blksz >> $seqres.full
 done
 
-echo "Create metadump file"
 _scratch_unmount
-_scratch_xfs_metadump $metadump_file
 
-# Now restore the obfuscated one back and take a look around
-echo "Restore metadump"
-SCRATCH_DEV=$TEST_DIR/image _scratch_xfs_mdrestore $metadump_file
-SCRATCH_DEV=$TEST_DIR/image _scratch_mount
-SCRATCH_DEV=$TEST_DIR/image _scratch_unmount
+echo "Create metadump file, restore it and check restored fs"
+
+verify_metadump_v1 $max_md_version
 
-echo "Check restored fs"
-_check_generic_filesystem $metadump_file
+if [[ $max_md_version == 2 ]]; then
+       verify_metadump_v2
+fi
 
 # success, all done
 status=0

diff --git a/tests/xfs/129.out b/tests/xfs/129.out
index da6f43fdd9094fc61c4e4514adf25571b61cd8d8..0f24c431fe68cfe9ac8d68bbd56b3c46aadcce84 100644 (file)
--- a/tests/xfs/129.out
+++ b/tests/xfs/129.out
@@ -1,6 +1,4 @@
 QA output created by 129
 Create the original file blocks
 Reflink every other block
-Create metadump file
-Restore metadump
-Check restored fs
+Create metadump file, restore it and check restored fs

diff --git a/tests/xfs/234 b/tests/xfs/234
index 57d447c056ffd2207476e26a68ccd5bdebc19c94..c9bdb674ab61e198d4d8fe9bb6af2090841c6c58 100755 (executable)
--- a/tests/xfs/234
+++ b/tests/xfs/234
@@ -16,7 +16,11 @@ _cleanup()
 {
     cd /
     _scratch_unmount > /dev/null 2>&1
-    rm -rf $tmp.* $metadump_file $TEST_DIR/image
+    [[ -n $logdev && $logdev != "none" && $logdev != $SCRATCH_LOGDEV ]] && \
+           _destroy_loop_device $logdev
+    [[ -n $datadev ]] && _destroy_loop_device $datadev
+    rm -rf $tmp.* $testdir $metadump_file $TEST_DIR/image \
+       $TEST_DIR/log-image
 }
 
 # Import common functions.
@@ -29,12 +33,86 @@ _require_loop
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fpunch"
 
+metadump_file=$TEST_DIR/${seq}_metadump
+
+verify_metadump_v1()
+{
+       local max_version=$1
+       local version=""
+
+       if [[ $max_version == 2 ]]; then
+               version="-v 1"
+       fi
+
+       _scratch_xfs_metadump $metadump_file $version
+
+       SCRATCH_DEV=$TEST_DIR/data-image SCRATCH_LOGDEV="" \
+                  _scratch_xfs_mdrestore $metadump_file
+
+       datadev=$(_create_loop_device $TEST_DIR/data-image)
+
+       SCRATCH_DEV=$datadev _scratch_mount
+       SCRATCH_DEV=$datadev _scratch_unmount
+
+       logdev=$SCRATCH_LOGDEV
+       [[ -z $logdev ]] && logdev=none
+       _check_xfs_filesystem $datadev $logdev none
+
+       _destroy_loop_device $datadev
+       datadev=""
+       rm -f $TEST_DIR/data-image
+}
+
+verify_metadump_v2()
+{
+       version="-v 2"
+
+       _scratch_xfs_metadump $metadump_file $version
+
+       # Metadump v2 files can contain contents dumped from an external log
+       # device. Use a temporary file to hold the log device contents restored
+       # from such a metadump file.
+       slogdev=""
+       if [[ -n $SCRATCH_LOGDEV ]]; then
+               slogdev=$TEST_DIR/log-image
+       fi
+
+       SCRATCH_DEV=$TEST_DIR/data-image SCRATCH_LOGDEV=$slogdev \
+                  _scratch_xfs_mdrestore $metadump_file
+
+       datadev=$(_create_loop_device $TEST_DIR/data-image)
+
+       logdev=${SCRATCH_LOGDEV}
+       if [[ -s $TEST_DIR/log-image ]]; then
+               logdev=$(_create_loop_device $TEST_DIR/log-image)
+       fi
+
+       SCRATCH_DEV=$datadev SCRATCH_LOGDEV=$logdev _scratch_mount
+       SCRATCH_DEV=$datadev SCRATCH_LOGDEV=$logdev _scratch_unmount
+
+       [[ -z $logdev ]] && logdev=none
+       _check_xfs_filesystem $datadev $logdev none
+
+       if [[ -s $TEST_DIR/log-image ]]; then
+               _destroy_loop_device $logdev
+               logdev=""
+               rm -f $TEST_DIR/log-image
+       fi
+
+       _destroy_loop_device $datadev
+       datadev=""
+       rm -f $TEST_DIR/data-image
+}
+
 _scratch_mkfs >/dev/null 2>&1
+
+max_md_version=1
+_scratch_metadump_v2_supported && max_md_version=2
+
 _scratch_mount
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
-metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"
 blksz="$(_get_block_size $testdir)"
@@ -47,18 +125,15 @@ seq 1 2 $((nr_blks - 1)) | while read nr; do
        $XFS_IO_PROG -c "fpunch $((nr * blksz)) $blksz" $testdir/file1 >> $seqres.full
 done
 
-echo "Create metadump file"
 _scratch_unmount
-_scratch_xfs_metadump $metadump_file
 
-# Now restore the obfuscated one back and take a look around
-echo "Restore metadump"
-SCRATCH_DEV=$TEST_DIR/image _scratch_xfs_mdrestore $metadump_file
-SCRATCH_DEV=$TEST_DIR/image _scratch_mount
-SCRATCH_DEV=$TEST_DIR/image _scratch_unmount
+echo "Create metadump file, restore it and check restored fs"
+
+verify_metadump_v1 $max_md_version
 
-echo "Check restored fs"
-_check_generic_filesystem $metadump_file
+if [[ $max_md_version == 2 ]]; then
+       verify_metadump_v2
+fi
 
 # success, all done
 status=0

diff --git a/tests/xfs/234.out b/tests/xfs/234.out
index 463d4660ad21399d551d3c85dae2b0463e856636..fc2ddd770c482a4133f9b859c824fb53b3974620 100644 (file)
--- a/tests/xfs/234.out
+++ b/tests/xfs/234.out
@@ -1,6 +1,4 @@
 QA output created by 234
 Create the original file blocks
 Punch every other block
-Create metadump file
-Restore metadump
-Check restored fs
+Create metadump file, restore it and check restored fs

diff --git a/tests/xfs/253 b/tests/xfs/253
index ce90247777cb2bca6f1277dc43b204436d9c2d81..8e18ddb83a674f664597ce5b62218681d5401bcf 100755 (executable)
--- a/tests/xfs/253
+++ b/tests/xfs/253
@@ -27,6 +27,9 @@ _cleanup()
     rm -f $tmp.*
     rm -rf "${OUTPUT_DIR}"
     rm -f "${METADUMP_FILE}"
+    [[ -n $logdev && $logdev != $SCRATCH_LOGDEV ]] && \
+           _destroy_loop_device $logdev
+    [[ -n $datadev ]] && _destroy_loop_device $datadev
 }
 
 # Import common functions.
@@ -49,21 +52,101 @@ function create_file() {
        touch $(printf "$@")
 }
 
+verify_metadump_v1()
+{
+       local max_version=$1
+       local version=""
+
+       if [[ $max_version == 2 ]]; then
+               version="-v 1"
+       fi
+
+       _scratch_xfs_metadump $METADUMP_FILE $version
+
+       SCRATCH_DEV=$TEST_DIR/data-image SCRATCH_LOGDEV="" \
+                  _scratch_xfs_mdrestore $METADUMP_FILE
+
+       datadev=$(_create_loop_device $TEST_DIR/data-image)
+
+       SCRATCH_DEV=$datadev _scratch_mount
+
+       cd "${SCRATCH_MNT}"
+
+       # Get a listing of all the files after obfuscation
+       echo "Metadump v1" >> $seqres.full
+       ls -R >> $seqres.full
+       ls -R | od -c >> $seqres.full
+
+       cd /
+
+       SCRATCH_DEV=$datadev _scratch_unmount
+
+       _destroy_loop_device $datadev
+       datadev=""
+       rm -f $TEST_DIR/data-image
+}
+
+verify_metadump_v2()
+{
+       version="-v 2"
+
+       _scratch_xfs_metadump $METADUMP_FILE $version
+
+       # Metadump v2 files can contain contents dumped from an external log
+       # device. Use a temporary file to hold the log device contents restored
+       # from such a metadump file.
+       slogdev=""
+       if [[ -n $SCRATCH_LOGDEV ]]; then
+               slogdev=$TEST_DIR/log-image
+       fi
+
+       SCRATCH_DEV=$TEST_DIR/data-image SCRATCH_LOGDEV=$slogdev \
+                  _scratch_xfs_mdrestore $METADUMP_FILE
+
+       datadev=$(_create_loop_device $TEST_DIR/data-image)
+
+       logdev=${SCRATCH_LOGDEV}
+       if [[ -s $TEST_DIR/log-image ]]; then
+               logdev=$(_create_loop_device $TEST_DIR/log-image)
+       fi
+
+       SCRATCH_DEV=$datadev SCRATCH_LOGDEV=$logdev _scratch_mount
+
+       cd "${SCRATCH_MNT}"
+
+       # Get a listing of all the files after obfuscation
+       echo "Metadump v2" >> $seqres.full
+       ls -R >> $seqres.full
+       ls -R | od -c >> $seqres.full
+
+       cd /
+
+       SCRATCH_DEV=$datadev SCRATCH_LOGDEV=$logdev _scratch_unmount
+
+       if [[ -s $TEST_DIR/log-image ]]; then
+               _destroy_loop_device $logdev
+               logdev=""
+               rm -f $TEST_DIR/log-image
+       fi
+
+       _destroy_loop_device $datadev
+       datadev=""
+       rm -f $TEST_DIR/data-image
+}
+
 echo "Disciplyne of silence is goed."
 
 _scratch_mkfs >/dev/null 2>&1
 _scratch_mount
 
-# Initialize and mount the scratch filesystem, then create a bunch
-# of files that exercise the original problem.
+# Initialize and mount the scratch filesystem, then create a bunch of
+# files that exercise the original problem.
 #
 # The problem arose when a file name produced a hash that contained
-# either 0x00 (string terminator) or 0x27 ('/' character) in a
-# spot used to determine a character in an obfuscated name.  This
-# occurred in one of 5 spots at the end of the name, at position
-# (last-4), (last-3), (last-2), (last-1), or (last).
-
-rm -f "${METADUMP_FILE}"
+# either 0x00 (string terminator) or 0x27 ('/' character) in a spot used
+# to determine a character in an obfuscated name.  This occurred in one
+# of 5 spots at the end of the name, at position (last-4), (last-3),
+# (last-2), (last-1), or (last).
 
 mkdir -p "${OUTPUT_DIR}"
 
@@ -78,8 +161,8 @@ create_file 'lmno'           # hash 0x0d9b776f (4-byte name)
 create_file 'pqrstu'           # hash 0x1e5cf9f2 (6-byte name)
 create_file 'abcdefghijklmnopqrstuvwxyz' # a most remarkable word (0x55004ae3)
 
-# Create a short directory name; it won't be obfuscated.  Populate
-# it with some longer named-files.  The first part of the obfuscated
+# Create a short directory name; it won't be obfuscated.  Populate it
+# with some longer named-files.  The first part of the obfuscated
 # filenames should use printable characters.
 mkdir foo
 create_file 'foo/longer_file_name_1'   # hash 0xe83634ec
@@ -149,22 +232,19 @@ ls -R | od -c >> $seqres.full
 cd $here
 
 _scratch_unmount
-_scratch_xfs_metadump $METADUMP_FILE
 
-# Now restore the obfuscated one back and take a look around
-_scratch_xfs_mdrestore "$METADUMP_FILE"
+max_md_version=1
+_scratch_metadump_v2_supported && max_md_version=2
 
-_scratch_mount
+verify_metadump_v1 $max_md_version
 
-# Get a listing of all the files after obfuscation
-cd ${SCRATCH_MNT}
-ls -R >> $seqres.full
-ls -R | od -c >> $seqres.full
+if [[ $max_md_version == 2 ]]; then
+       verify_metadump_v2
+fi
 
 # Finally, re-make the filesystem since to ensure we don't
 # leave a directory with duplicate entries lying around.
 cd /
-_scratch_unmount
 _scratch_mkfs >/dev/null 2>&1
 
 # all done

diff --git a/tests/xfs/291 b/tests/xfs/291
index 54448497cc29e135c023d3d4f8df6439599b57b8..33193eb78e04d7e455f8c41b991cc51f9a0848e3 100755 (executable)
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -92,10 +92,27 @@ _scratch_xfs_check >> $seqres.full 2>&1 || _fail "xfs_check failed"
 
 # Yes they can!  Now...
 # Can xfs_metadump cope with this monster?
-_scratch_xfs_metadump $tmp.metadump -a -o || _fail "xfs_metadump failed"
-SCRATCH_DEV=$tmp.img _scratch_xfs_mdrestore $tmp.metadump || _fail "xfs_mdrestore failed"
-SCRATCH_DEV=$tmp.img _scratch_xfs_repair -f &>> $seqres.full || \
-       _fail "xfs_repair of metadump failed"
+max_md_version=1
+_scratch_metadump_v2_supported && max_md_version=2
+
+for md_version in $(seq 1 $max_md_version); do
+       version=""
+       if [[ $max_md_version == 2 ]]; then
+               version="-v $md_version"
+       fi
+
+       _scratch_xfs_metadump $tmp.metadump -a -o $version || \
+               _fail "xfs_metadump failed"
+
+       slogdev=$SCRATCH_LOGDEV
+       if [[ -z $version || $version == "-v 1" ]]; then
+               slogdev=""
+       fi
+       SCRATCH_DEV=$tmp.img SCRATCH_LOGDEV=$slogdev _scratch_xfs_mdrestore \
+                  $tmp.metadump || _fail "xfs_mdrestore failed"
+       SCRATCH_DEV=$tmp.img _scratch_xfs_repair -f &>> $seqres.full || \
+               _fail "xfs_repair of metadump failed"
+done
 
 # Yes it can; success, all done
 status=0

diff --git a/tests/xfs/432 b/tests/xfs/432
index dae68fb2dd90d5d49459b34349bc7a760fa5d32f..a215d3ce2e6eec4b944aed876d4b32aed80c69a9 100755 (executable)
--- a/tests/xfs/432
+++ b/tests/xfs/432
@@ -50,6 +50,7 @@ echo "Format and mount"
 # block.  8187 hashes/dablk / 248 dirents/dirblock = ~33 dirblocks per
 # dablock.  33 dirblocks * 64k mean that we can expand a directory by
 # 2112k before we have to allocate another da btree block.
+
 _scratch_mkfs -b size=1k -n size=64k > "$seqres.full" 2>&1
 _scratch_mount >> "$seqres.full" 2>&1
 
@@ -85,13 +86,29 @@ extlen="$(check_for_long_extent $dir_inum)"
 echo "qualifying extent: $extlen blocks" >> $seqres.full
 test -n "$extlen" || _notrun "could not create dir extent > 1000 blocks"
 
-echo "Try to metadump"
-_scratch_xfs_metadump $metadump_file -a -o -w
-SCRATCH_DEV=$metadump_img _scratch_xfs_mdrestore $metadump_file
+echo "Try to metadump, restore and check restored metadump image"
+max_md_version=1
+_scratch_metadump_v2_supported && max_md_version=2
+
+for md_version in $(seq 1 $max_md_version); do
+       version=""
+       if [[ $max_md_version == 2 ]]; then
+               version="-v $md_version"
+       fi
+
+       _scratch_xfs_metadump $metadump_file -a -o -w $version
 
-echo "Check restored metadump image"
-SCRATCH_DEV=$metadump_img _scratch_xfs_repair -n &>> $seqres.full || \
-       echo "xfs_repair on restored fs returned $?"
+       slogdev=$SCRATCH_LOGDEV
+       if [[ -z $version || $version == "-v 1" ]]; then
+               slogdev=""
+       fi
+
+       SCRATCH_DEV=$metadump_img SCRATCH_LOGDEV=$slogdev \
+                  _scratch_xfs_mdrestore $metadump_file
+
+       SCRATCH_DEV=$metadump_img _scratch_xfs_repair -n &>> $seqres.full || \
+               echo "xfs_repair on restored fs returned $?"
+done
 
 # success, all done
 status=0

diff --git a/tests/xfs/432.out b/tests/xfs/432.out
index 1f135d16ef5047c72db59d7ff2d41d91c7ebe011..37bac90203392c24681faf2bb02553e2696119e9 100644 (file)
--- a/tests/xfs/432.out
+++ b/tests/xfs/432.out
@@ -2,5 +2,4 @@ QA output created by 432
 Format and mount
 Create huge dir
 Check for > 1000 block extent?
-Try to metadump
-Check restored metadump image
+Try to metadump, restore and check restored metadump image

diff --git a/tests/xfs/503 b/tests/xfs/503
index 8805632d4fcb820474d03e09bb20652c4ab8299b..a1479eb613e0bbe5c1acfb9d877521f99017eff3 100755 (executable)
--- a/tests/xfs/503
+++ b/tests/xfs/503
@@ -29,6 +29,7 @@ testdir=$TEST_DIR/test-$seq
 _supported_fs xfs
 
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
+_require_loop
 _require_xfs_copy
 _require_scratch_nocheck
 _require_populate_commands
@@ -40,22 +41,69 @@ _scratch_populate_cached nofill > $seqres.full 2>&1
 
 mkdir -p $testdir
 metadump_file=$testdir/scratch.md
-metadump_file_a=${metadump_file}.a
-metadump_file_g=${metadump_file}.g
-metadump_file_ag=${metadump_file}.ag
 copy_file=$testdir/copy.img
 
-echo metadump
-_scratch_xfs_metadump $metadump_file -a -o >> $seqres.full
-
-echo metadump a
-_scratch_xfs_metadump $metadump_file_a -a >> $seqres.full
+check_restored_metadump_image()
+{
+       local image=$1
 
-echo metadump g
-_scratch_xfs_metadump $metadump_file_g -g >> $seqres.full
+       loop_dev=$(_create_loop_device $image)
+       SCRATCH_DEV=$loop_dev _scratch_mount
+       SCRATCH_DEV=$loop_dev _check_scratch_fs
+       SCRATCH_DEV=$loop_dev _scratch_unmount
+       _destroy_loop_device $loop_dev
+}
 
-echo metadump ag
-_scratch_xfs_metadump $metadump_file_ag -a -g >> $seqres.full
+max_md_version=1
+_scratch_metadump_v2_supported && max_md_version=2
+
+echo "metadump and mdrestore"
+for md_version in $(seq 1 $max_md_version); do
+       version=""
+       if [[ $max_md_version == 2 ]]; then
+               version="-v $md_version"
+       fi
+
+       _scratch_xfs_metadump $metadump_file -a -o $version >> $seqres.full
+       SCRATCH_DEV=$TEST_DIR/image _scratch_xfs_mdrestore $metadump_file
+       check_restored_metadump_image $TEST_DIR/image
+done
+
+echo "metadump a and mdrestore"
+for md_version in $(seq 1 $max_md_version); do
+       version=""
+       if [[ $max_md_version == 2 ]]; then
+               version="-v $md_version"
+       fi
+
+       _scratch_xfs_metadump $metadump_file -a $version >> $seqres.full
+       SCRATCH_DEV=$TEST_DIR/image _scratch_xfs_mdrestore $metadump_file
+       check_restored_metadump_image $TEST_DIR/image
+done
+
+echo "metadump g and mdrestore"
+for md_version in $(seq 1 $max_md_version); do
+       version=""
+       if [[ $max_md_version == 2 ]]; then
+               version="-v $md_version"
+       fi
+
+       _scratch_xfs_metadump $metadump_file -g $version >> $seqres.full
+       SCRATCH_DEV=$TEST_DIR/image _scratch_xfs_mdrestore $metadump_file
+       check_restored_metadump_image $TEST_DIR/image
+done
+
+echo "metadump ag and mdrestore"
+for md_version in $(seq 1 $max_md_version); do
+       version=""
+       if [[ $max_md_version == 2 ]]; then
+               version="-v $md_version"
+       fi
+
+       _scratch_xfs_metadump $metadump_file -a -g $version >> $seqres.full
+       SCRATCH_DEV=$TEST_DIR/image _scratch_xfs_mdrestore $metadump_file
+       check_restored_metadump_image $TEST_DIR/image
+done
 
 echo copy
 $XFS_COPY_PROG $SCRATCH_DEV $copy_file >> $seqres.full
@@ -67,30 +115,6 @@ _scratch_mount
 _check_scratch_fs
 _scratch_unmount
 
-echo mdrestore
-_scratch_xfs_mdrestore $metadump_file
-_scratch_mount
-_check_scratch_fs
-_scratch_unmount
-
-echo mdrestore a
-_scratch_xfs_mdrestore $metadump_file_a
-_scratch_mount
-_check_scratch_fs
-_scratch_unmount
-
-echo mdrestore g
-_scratch_xfs_mdrestore $metadump_file_g
-_scratch_mount
-_check_scratch_fs
-_scratch_unmount
-
-echo mdrestore ag
-_scratch_xfs_mdrestore $metadump_file_ag
-_scratch_mount
-_check_scratch_fs
-_scratch_unmount
-
 # success, all done
 status=0
 exit

diff --git a/tests/xfs/503.out b/tests/xfs/503.out
index 8ef31dbef3bef87b92977840c83295d816a3cc8a..496f2516e4c4d522b4e2c89cd1609304c7b26174 100644 (file)
--- a/tests/xfs/503.out
+++ b/tests/xfs/503.out
@@ -1,12 +1,8 @@
 QA output created by 503
 Format and populate
-metadump
-metadump a
-metadump g
-metadump ag
+metadump and mdrestore
+metadump a and mdrestore
+metadump g and mdrestore
+metadump ag and mdrestore
 copy
 recopy
-mdrestore
-mdrestore a
-mdrestore g
-mdrestore ag