From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp2130.oracle.com ([141.146.126.79]:51552 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751233AbeB0BR0 (ORCPT ); Mon, 26 Feb 2018 20:17:26 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w1R1HQmY106459 for ; Tue, 27 Feb 2018 01:17:26 GMT Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2130.oracle.com with ESMTP id 2gcw4u02tq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Feb 2018 01:17:25 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w1R1HPvs001851 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Feb 2018 01:17:25 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w1R1HO3N020848 for ; Tue, 27 Feb 2018 01:17:24 GMT Subject: Re: [PATCH 1/1] xfs: update the output of AG metadata corruption checking and repair tests References: <1519633573-7807-1-git-send-email-shan.hai@oracle.com> <20180226225222.GF19312@magnolia> From: Shan Hai Message-ID: <0f65f67a-254a-4333-c442-30ee8f6bccf9@oracle.com> Date: Tue, 27 Feb 2018 09:17:14 +0800 MIME-Version: 1.0 In-Reply-To: <20180226225222.GF19312@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org On 2018年02月27日 06:52, Darrick J. Wong wrote: > On Mon, Feb 26, 2018 at 04:26:13PM +0800, Shan Hai wrote: >> The xfs/087 and xfs/097 fail after the introduction of the >> "xfs: set up per-AG free space reservations" in the kernel code, >> because the filesystem is shutdown by the per-AG metadata reservation >> code on the -EFSCORRUPTED error, the above mentioned tests initiate >> the -EFSCORRUPTED error intentionally but its results checking part is >> out of date and cause the failure of the tests. > Hmm, I think this test (and the other blocktrash fuzzers) need more > surgery than this. Those tests do: > > 1. format > 2. blocktrash > 3. mount > 4. modify fs > 5. unmount > > However, in light of Eryu's changes to _scratch_mount to _fail the test > if the mount fails, that needs to become... > > if _scratch_mount >> $seqres.full 2>&1; then > # modify fs > _scratch_umount > fi Agreed. > Note that this also solves the 'structure needs cleaning' lines in the > dirty output. Since there are a lot of blocktrash fuzzers I'll take > care of fixing them all for you. It's been too long since I ran them > anyway. > Thanks for your kind help. >> Update the output of the tests to match with the current kernel behavior. >> >> Signed-off-by: Shan Hai >> --- >> tests/xfs/087 | 32 ++++++++++++++++---------------- >> tests/xfs/087.out | 26 ++++++++++++++------------ >> tests/xfs/097 | 32 ++++++++++++++++---------------- >> tests/xfs/097.out | 26 ++++++++++++++------------ >> 4 files changed, 60 insertions(+), 56 deletions(-) >> >> diff --git a/tests/xfs/087 b/tests/xfs/087 >> index 58ba958..d557c12 100755 >> --- a/tests/xfs/087 >> +++ b/tests/xfs/087 >> @@ -58,14 +58,14 @@ rm -f $seqres.full >> TESTDIR="${SCRATCH_MNT}/scratchdir" >> TESTFILE="${TESTDIR}/testfile" >> >> -echo "+ create scratch fs" >> +echo "create scratch fs" > Why is it necessary to change this part of the golden output? In order to make the format consistent in the x.out file, since the output of the '_try_scratch_mount 2>&1 | _filter_error_mount' lacks leading '+'. Thanks Shan Hai > > --D > >> _scratch_mkfs_xfs > /dev/null >> >> -echo "+ mount fs image" >> +echo "mount fs image" >> _scratch_mount >> blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" >> >> -echo "+ make some files" >> +echo "make some files" >> mkdir -p "${TESTDIR}" >> for x in `seq 1 1024`; do >> touch "${SCRATCH_MNT}/junk.${x}" >> @@ -80,45 +80,45 @@ for x in `seq 2 64`; do >> done >> inode="$(stat -c '%i' "${TESTFILE}.1")" >> agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')" >> -umount "${SCRATCH_MNT}" >> +_scratch_unmount >> >> -echo "+ check fs" >> +echo "check fs" >> _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" >> >> -echo "+ corrupt image" >> +echo "corrupt image" >> for ag in $(seq 1 $((agcount - 1))) 0; do >> _scratch_xfs_db -x -c "agi ${ag}" -c "agi ${ag}" -c "stack" -c "blocktrash -x 32 -o +64 -y 4096 -z ${FUZZ_ARGS}" >> $seqres.full 2>&1 >> done >> >> -echo "+ mount image" >> -_scratch_mount >> +echo "mount image" >> +_try_scratch_mount 2>&1 | _filter_error_mount >> >> -echo "+ modify files" >> +echo "modify files" >> broken=0 >> for x in `seq 65 70`; do >> touch "${TESTFILE}.${x}" 2> /dev/null || broken=1 >> done >> echo "broken: ${broken}" >> -umount "${SCRATCH_MNT}" >> +_scratch_unmount 2>&1 | _filter_scratch >> >> -echo "+ repair fs" >> +echo "repair fs" >> _scratch_xfs_repair >> $seqres.full 2>&1 >> >> -echo "+ mount image (2)" >> +echo "mount image (2)" >> _scratch_mount >> >> -echo "+ chattr -R -i" >> +echo "chattr -R -i" >> $CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" >> >> -echo "+ modify files (2)" >> +echo "modify files (2)" >> broken=0 >> for x in `seq 65 70`; do >> touch "${TESTFILE}.${x}" || broken=1 >> done >> echo "broken: ${broken}" >> -umount "${SCRATCH_MNT}" >> +_scratch_unmount >> >> -echo "+ check fs (2)" >> +echo "check fs (2)" >> _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" >> >> status=0 >> diff --git a/tests/xfs/087.out b/tests/xfs/087.out >> index 1f6e0b5..c4aee5a 100644 >> --- a/tests/xfs/087.out >> +++ b/tests/xfs/087.out >> @@ -1,15 +1,17 @@ >> QA output created by 087 >> -+ create scratch fs >> -+ mount fs image >> -+ make some files >> -+ check fs >> -+ corrupt image >> -+ mount image >> -+ modify files >> +create scratch fs >> +mount fs image >> +make some files >> +check fs >> +corrupt image >> +mount image >> +mount: Structure needs cleaning >> +modify files >> broken: 1 >> -+ repair fs >> -+ mount image (2) >> -+ chattr -R -i >> -+ modify files (2) >> +umount: SCRATCH_DEV: not mounted. >> +repair fs >> +mount image (2) >> +chattr -R -i >> +modify files (2) >> broken: 0 >> -+ check fs (2) >> +check fs (2) >> diff --git a/tests/xfs/097 b/tests/xfs/097 >> index 303ad04..4d6fda5 100755 >> --- a/tests/xfs/097 >> +++ b/tests/xfs/097 >> @@ -60,15 +60,15 @@ rm -f $seqres.full >> TESTDIR="${SCRATCH_MNT}/scratchdir" >> TESTFILE="${TESTDIR}/testfile" >> >> -echo "+ create scratch fs" >> +echo "create scratch fs" >> _scratch_mkfs_xfs > /dev/null >> >> -echo "+ mount fs image" >> +echo "mount fs image" >> _scratch_mount >> xfs_info "${SCRATCH_MNT}" | grep -q "finobt=1" || _notrun "finobt not enabled" >> blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" >> >> -echo "+ make some files" >> +echo "make some files" >> mkdir -p "${TESTDIR}" >> for x in `seq 1 1024`; do >> touch "${SCRATCH_MNT}/junk.${x}" >> @@ -83,45 +83,45 @@ for x in `seq 2 64`; do >> done >> inode="$(stat -c '%i' "${TESTFILE}.1")" >> agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')" >> -umount "${SCRATCH_MNT}" >> +_scratch_unmount 2>&1 | _filter_scratch >> >> -echo "+ check fs" >> +echo "check fs" >> _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" >> >> -echo "+ corrupt image" >> +echo "corrupt image" >> for ag in $(seq 1 $((agcount - 1))) 0; do >> _scratch_xfs_db -x -c "agi ${ag}" -c "agi ${ag}" -c "addr free_root" -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full 2>&1 >> done >> >> -echo "+ mount image" >> -_scratch_mount >> +echo "mount image" >> +_try_scratch_mount 2>&1 | _filter_error_mount >> >> -echo "+ modify files" >> +echo "modify files" >> broken=0 >> for x in `seq 65 70`; do >> touch "${TESTFILE}.${x}" 2> /dev/null || broken=1 >> done >> echo "broken: ${broken}" >> -umount "${SCRATCH_MNT}" >> +_scratch_unmount 2>&1 | _filter_scratch >> >> -echo "+ repair fs" >> +echo "repair fs" >> _scratch_xfs_repair >> $seqres.full 2>&1 >> >> -echo "+ mount image (2)" >> +echo "mount image (2)" >> _scratch_mount >> >> -echo "+ chattr -R -i" >> +echo "chattr -R -i" >> $CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" >> >> -echo "+ modify files (2)" >> +echo "modify files (2)" >> broken=0 >> for x in `seq 65 70`; do >> touch "${TESTFILE}.${x}" || broken=1 >> done >> echo "broken: ${broken}" >> -umount "${SCRATCH_MNT}" >> +_scratch_unmount >> >> -echo "+ check fs (2)" >> +echo "check fs (2)" >> _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" >> >> status=0 >> diff --git a/tests/xfs/097.out b/tests/xfs/097.out >> index 84f6a70..0eb2085 100644 >> --- a/tests/xfs/097.out >> +++ b/tests/xfs/097.out >> @@ -1,15 +1,17 @@ >> QA output created by 097 >> -+ create scratch fs >> -+ mount fs image >> -+ make some files >> -+ check fs >> -+ corrupt image >> -+ mount image >> -+ modify files >> +create scratch fs >> +mount fs image >> +make some files >> +check fs >> +corrupt image >> +mount image >> +mount: Structure needs cleaning >> +modify files >> broken: 1 >> -+ repair fs >> -+ mount image (2) >> -+ chattr -R -i >> -+ modify files (2) >> +umount: SCRATCH_DEV: not mounted. >> +repair fs >> +mount image (2) >> +chattr -R -i >> +modify files (2) >> broken: 0 >> -+ check fs (2) >> +check fs (2) >> -- >> 2.7.4 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html