xfs: test xfsdump when an inode < root inode is present
PATCH 1/1 xfs: test xfsdump when an inode < root inode is present
This tests a longstanding bug where xfsdumps are not properly created when an inode is present on the filesytsem which has a lower number than the root inode.
--- common/dump | 1 + tests/xfs/543 | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/543.out | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 tests/xfs/543 create mode 100644 tests/xfs/543.out
common/dump +1 -0
@@ -214,6 +214,7 @@ _require_tape() _wipe_fs() { + [[ "$WIPE_FS" = "no" ]] && return _require_scratch _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
tests/xfs/543 new file +63 -0
63 lines not on this page · raw message
tests/xfs/543.out new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Quoted 6 lines · Eric Sandeen
This tests a longstanding bug where xfsdumps are not properly created when an inode is present on the filesytsem which has a lower number than the root inode.
Signed-off-by Eric Sandeen <[email protected]>---
Hi Eric,
Thanks for this patch! That's a good idea to get a inode number less than root inode, at least I don't know a better one :)
The source code looks good to me, just two problems as below:
1) The mkfs might output some warning as [0], so better to filter them all.
2) After merging this patch (got a warning [1], that's fine:), build xfstests failed as [2]. By debuging, I found that your xfs/543 file miss executable bit [3]. By giving it '+x' permission, make passed.
Thanks,
Zorro
[0]
# diff -u /home/xfstests-dev/tests/xfs/543.out /home/xfstests-dev/results//xfs/543.out.bad @@ -1,4 +1,8 @@ QA output created by 543 +mkfs.xfs: Specified data stripe unit 1024 is not the same as the volume stripe unit 512 +mkfs.xfs: Specified data stripe width 1024 is not the same as the volume stripe width 512 +log stripe unit (524288 bytes) is too large (maximum is 256KiB) +log stripe unit adjusted to 32KiB ...
[1]
# git am /tmp/1.patch Applying: xfs: test xfsdump when an inode < root inode is present .git/rebase-apply/patch:107: trailing whitespace. xfsrestore: dump description: warning: 1 line adds whitespace errors.
[2]
# make ... Building xfs [GROUP] /home/xfstests-dev/tests/xfs/group.list gmake[3]: *** [../../include/buildgrouplist:8: group.list] Error 1 gmake[2]: *** [../include/buildrules:31: xfs] Error 2 gmake[1]: *** [include/buildrules:31: tests] Error 2 make: *** [Makefile:51: default] Error 2
[3]
# git ls-files -s tests/xfs/54* 100755 55484dd3310cde1e7b26e01d0e6b97e492e14fb5 0 tests/xfs/540 100644 094f0f63dd6ce685ec2c467f3f0eea0f9532124e 0 tests/xfs/540.out 100755 ae2fd819d5f089cfa64ff9fee299bb59b0ea6c71 0 tests/xfs/541 100644 d056f0532b7c5734488c84ad6f8e1592e1c794dc 0 tests/xfs/541.out 100755 5c45eed7cdabfcb42ce1e797ac47f5f0cee55146 0 tests/xfs/542 100644 0a0fbd524b9f699267816775b1cb2bb53ae309e9 0 tests/xfs/542.out 100644 f75f8da3ad7ad8971dade88eb8e7bcecb2a62125 0 tests/xfs/543 <=== 100644 a5224aaf082dbdfb6c92050a25aa0ca09c045b89 0 tests/xfs/543.out
Quoted 144 lines
common/dump | 1 + tests/xfs/543 | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/543.out | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 tests/xfs/543 create mode 100644 tests/xfs/543.outcommon/dump +1
-0@@ -214,6 +214,7 @@ _require_tape() _wipe_fs() { + [[ "$WIPE_FS" = "no" ]] && return _require_scratch _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"tests/xfs/543 new file +63
-0@@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test 543 +# +# Create a filesystem which contains an inode with a lower number +# than the root inode. Ensure that xfsdump/xfsrestore handles this. +# +. ./common/preamble +_begin_fstest auto quick dump + +# Import common functions. +. ./common/dump + +_supported_fs xfs +_require_scratch + +# A large stripe unit will put the root inode out quite far +# due to alignment, leaving free blocks ahead of it. +_scratch_mkfs_xfs -d sunit=1024,swidth=1024 > $seqres.full + +# Mounting /without/ a stripe should allow inodes to be allocated +# in lower free blocks, without the stripe alignment. +_scratch_mount -o sunit=0,swidth=0 + +root_inum=$(stat -c %i $SCRATCH_MNT) + +# Consume space after the root inode so that the blocks before +# root look "close" for the next inode chunk allocation +$XFS_IO_PROG -f -c "falloc 0 16m" $SCRATCH_MNT/fillfile + +# And make a bunch of inodes until we (hopefully) get one lower +# than root, in a new inode chunk. +echo "root_inum: $root_inum" >> $seqres.full +for i in $(seq 0 4096) ; do + fname=$SCRATCH_MNT/$(printf "FILE_%03d" $i) + touch $fname + inum=$(stat -c "%i" $fname) + [[ $inum -lt $root_inum ]] && break +done + +echo "created: $inum" >> $seqres.full + +[[ $inum -lt $root_inum ]] || _notrun "Could not set up test" + +# Now try a dump and restore. Cribbed from xfs/068 +WIPE_FS="no" +_create_dumpdir_stress + +echo -n "Before: " >> $seqres.full +_count_dumpdir_files | tee $tmp.before >> $seqres.full + +# filter out the file count, it changes as fsstress adds new operations +_do_dump_restore | sed -e "/entries processed$/s/[0-9][0-9]*/NUM/g" + +echo -n "After: " >> $seqres.full +_count_restoredir_files | tee $tmp.after >> $seqres.full +diff -u $tmp.before $tmp.after + +# success, all done +status=0 +exittests/xfs/543.out new file +47
-0@@ -0,0 +1,47 @@ +QA output created by 543 +Creating directory system to dump using fsstress. + +----------------------------------------------- +fsstress : -f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10 +----------------------------------------------- +xfsdump|xfsrestore ... +xfsdump -s DUMP_SUBDIR - SCRATCH_MNT | xfsrestore - RESTORE_DIR +xfsrestore: using file dump (drive_simple) strategy +xfsrestore: searching media for dump +xfsrestore: examining media file 0 +xfsrestore: dump description: +xfsrestore: hostname: HOSTNAME +xfsrestore: mount point: SCRATCH_MNT +xfsrestore: volume: SCRATCH_DEV +xfsrestore: session time: TIME +xfsrestore: level: 0 +xfsrestore: session label: "" +xfsrestore: media label: "" +xfsrestore: file system ID: ID +xfsrestore: session id: ID +xfsrestore: media ID: ID +xfsrestore: searching media for directory dump +xfsrestore: reading directories +xfsrestore: NUM directories and NUM entries processed +xfsrestore: directory post-processing +xfsrestore: restoring non-directory files +xfsrestore: restore complete: SECS seconds elapsed +xfsrestore: Restore Status: SUCCESS +xfsdump: using file dump (drive_simple) strategy +xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT +xfsdump: dump date: DATE +xfsdump: session id: ID +xfsdump: session label: "" +xfsdump: ino map <PHASES> +xfsdump: ino map construction complete +xfsdump: estimated dump size: NUM bytes +xfsdump: /var/xfsdump/inventory created +xfsdump: creating dump session media file 0 (media 0, file 0) +xfsdump: dumping ino map +xfsdump: dumping directories +xfsdump: dumping non-directory files +xfsdump: ending media file +xfsdump: media file size NUM bytes +xfsdump: dump size (non-dir files) : NUM bytes +xfsdump: dump complete: SECS seconds elapsed +xfsdump: Dump Status: SUCCESSSignature · 1 line
1.8.3.1