On 9/28/22 21:49, Zorro Lang wrote: > On Wed, Sep 28, 2022 at 05:03:37PM -0400, Hironori Shiina wrote: >> Test '-x' option of xfsrestore. With this option, a wrong root inode >> number is corrected. A root inode number can be wrong in a dump created >> by problematic xfsdump (v3.1.7 - v3.1.9) with blukstat misuse. This >> patch adds a dump with a wrong inode number created by xfsdump 3.1.8. >> >> Link: https://lore.kernel.org/linux-xfs/20201113125127.966243-1-hsiangkao@xxxxxxxxxx/ >> Signed-off-by: Hironori Shiina <shiina.hironori@xxxxxxxxxxx> >> --- >> common/dump | 2 +- >> src/root-inode-broken-dumpfile | Bin 0 -> 21648 bytes >> tests/xfs/554 | 37 +++++++++++++++++++++ >> tests/xfs/554.out | 57 +++++++++++++++++++++++++++++++++ >> 4 files changed, 95 insertions(+), 1 deletion(-) >> create mode 100644 src/root-inode-broken-dumpfile >> create mode 100644 tests/xfs/554 >> create mode 100644 tests/xfs/554.out >> >> diff --git a/common/dump b/common/dump >> index 8e0446d9..50b2ba03 100644 >> --- a/common/dump >> +++ b/common/dump >> @@ -1003,7 +1003,7 @@ _parse_restore_args() >> --no-check-quota) >> do_quota_check=false >> ;; >> - -K|-R) >> + -K|-R|-x) >> restore_args="$restore_args $1" >> ;; >> *) >> diff --git a/src/root-inode-broken-dumpfile b/src/root-inode-broken-dumpfile >> new file mode 100644 >> index 0000000000000000000000000000000000000000..9a42e65d8047497be31f3abbaf4223ae384fd14d >> GIT binary patch >> literal 21648 >> zcmeI)K}ge49KiAC_J<CEBr!0AwBf~zbCHB}5DyxL6eU8Jnqylvayj;2VuG+d)TN6; >> z5J8vlAaw9hXi(UousT$Sin@BRJfwHM)O+*2*njz_zc+h*ckuV#@BMuKe;;JbgTL{< >> z!SwZ9zC#ERe%reLe5&cz2e}qM<!i2dXQHt^{^`d1Qx{)MMzW#$%dR@J={0`IRsGx4 >> z(yn@Oi-nBqCOVIG?&{kpwnv~&w_>6_ozY1^fph=w8(=^oTg&wOe=(WQByyQ_Hfd|4 >> z^o76<0!zn#v>k3blbU)nzx=KF^}-G%R;OaQYsHwGDkO`kD^@q^(_Ac_8H<gKj^>a0 >> z6p*%BK>q#b>2EE%^!@f?Z`-p+tI@M}qmMm@zMJk>K1U^=d~G^NUG?X4vkvKtOf-3Y >> zpVM9YgM9Y7{*P0ApJNUh^uk1wCnA6V0tg_000IagfB*srAb<b@2q1s}0tg_000Iag >> zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb`MM1p>_h >> z2-R=Q9ooK1{l9<Dy8IIMUVXr9BW9uI1x7};j+kij|5kLI^32no;n|PvqD74ZOlJ#n >> z0-~CKSlx#liMS>jt232#==00xPqwp;gsZrjc?`PPxaCE~>3(^o5-%+Nj=HegJFK2b >> z=l5zT4IDgO=sJ1zp=jyrALvcQJK|j;sN2_jUmobjN<!S6m1{G<LZ^+JP;T!|3{9)w >> eGf&ioo}iw|li2&4IyG;z<}vrl)Mic2`t2{52##q0 >> >> literal 0 >> HcmV?d00001 > > Please don't try to add a binary file to fstests directly. > >> >> diff --git a/tests/xfs/554 b/tests/xfs/554 >> new file mode 100644 >> index 00000000..13bc62c7 >> --- /dev/null >> +++ b/tests/xfs/554 >> @@ -0,0 +1,37 @@ >> +#! /bin/bash >> +# SPDX-License-Identifier: GPL-2.0 >> +# Copyright (c) 2022 Fujitsu Limited. All Rights Reserved. >> +# >> +# FS QA Test No. 554 >> +# >> +# Test restoring a dumpfile with a wrong root inode number created by >> +# xfsdump 3.1.8. >> +# This test restores the checked-in broken dump with '-x' flag. >> +# >> + >> +. ./common/preamble >> +_begin_fstest auto quick dump >> + >> +# Import common functions. >> +. ./common/dump >> + >> +# real QA test starts here >> +_supported_fs xfs >> +_require_scratch > > The -x option is a new feature for xfsdump, not all system support that. So > we need to _notrun if test on a system doesn't support it. A separated > _require_* helper would be better if there'll be more testing about this > new feature. Or a local detection in this case is fine too (can be moved as > a common helper later). > >> +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" >> +_scratch_mount >> + >> +# Create dumpdir for comparing with restoredir >> +rm -rf $dump_dir >> +mkdir $dump_dir || _fail "failed to mkdir $restore_dir" > ^^ ^^ > > Are you trying to create a dump dir or restore dir? > >> +touch $dump_dir/FILE_1019 >> + >> +_do_restore_toc -x -f $here/src/root-inode-broken-dumpfile > > Why I didn't see how you generate this broken dumpfile in this case? > > Oh... I see, you want to store a dumpfile in fstests source code directly. > I thought you submited that file accidentally... > > No, we don't do things like this way, please try to generate the dumpfile > in this test case at first, then restore it. For example using xfs_db to > break a xfs, or using some tricky method (likes xfs/545). > Thank you for the comments. I will try another approach. I'm having trouble creating a dumpfile for this test. Because xfsdump was already fixed, xfsdump no longer generates a corrupted dumpfile even if there is a lower inode number than a root inode. >> + >> +_do_restore_file -x -f $here/src/root-inode-broken-dumpfile -L stress_545 >> +_diff_compare_sub >> +_ls_nodate_compare_sub >> + >> +# success, all done >> +status=0 >> +exit >> diff --git a/tests/xfs/554.out b/tests/xfs/554.out >> new file mode 100644 >> index 00000000..40a3f3a4 >> --- /dev/null >> +++ b/tests/xfs/554.out >> @@ -0,0 +1,57 @@ >> +QA output created by 554 >> +Contents of dump ... >> +xfsrestore -x -f DUMP_FILE -t >> +xfsrestore: using file dump (drive_simple) strategy >> +xfsrestore: searching media for dump >> +xfsrestore: examining media file 0 >> +xfsrestore: dump description: >> +xfsrestore: hostname: xfsdump >> +xfsrestore: mount point: SCRATCH_MNT >> +xfsrestore: volume: SCRATCH_DEV >> +xfsrestore: session time: TIME >> +xfsrestore: level: 0 >> +xfsrestore: session label: "stress_545" >> +xfsrestore: media label: "stress_tape_media" >> +xfsrestore: file system ID: ID >> +xfsrestore: session id: ID >> +xfsrestore: media ID: ID >> +xfsrestore: searching media for directory dump >> +xfsrestore: reading directories >> +xfsrestore: found fake rootino #128, will fix. >> +xfsrestore: fix root # to 1024 (bind mount?) >> +xfsrestore: 2 directories and 2 entries processed >> +xfsrestore: directory post-processing >> +xfsrestore: reading non-directory files >> +xfsrestore: table of contents display complete: SECS seconds elapsed >> +xfsrestore: Restore Status: SUCCESS >> + >> +dumpdir/FILE_1019 >> +Restoring from file... >> +xfsrestore -x -f DUMP_FILE -L stress_545 RESTORE_DIR >> +xfsrestore: using file dump (drive_simple) strategy >> +xfsrestore: searching media for dump >> +xfsrestore: examining media file 0 >> +xfsrestore: found dump matching specified label: >> +xfsrestore: hostname: xfsdump >> +xfsrestore: mount point: SCRATCH_MNT >> +xfsrestore: volume: SCRATCH_DEV >> +xfsrestore: session time: TIME >> +xfsrestore: level: 0 >> +xfsrestore: session label: "stress_545" >> +xfsrestore: media label: "stress_tape_media" >> +xfsrestore: file system ID: ID >> +xfsrestore: session id: ID >> +xfsrestore: media ID: ID >> +xfsrestore: searching media for directory dump >> +xfsrestore: reading directories >> +xfsrestore: found fake rootino #128, will fix. >> +xfsrestore: fix root # to 1024 (bind mount?) >> +xfsrestore: 2 directories and 2 entries processed >> +xfsrestore: directory post-processing >> +xfsrestore: restoring non-directory files >> +xfsrestore: restore complete: SECS seconds elapsed >> +xfsrestore: Restore Status: SUCCESS >> +Comparing dump directory with restore directory >> +Files DUMP_DIR/FILE_1019 and RESTORE_DIR/DUMP_SUBDIR/FILE_1019 are identical >> +Comparing listing of dump directory with restore directory >> +Files TMP.dump_dir and TMP.restore_dir are identical >> -- >> 2.37.3 >> >
