apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: Use _require_btrfs_qgroup_report to replace open code

Browse Source 
Introduce new _require_btrfs_qgroup_report function, which will
check the accessibility to "btrfs check --qgroup-report", then set a
global flag to info _check_scratch_fs() to do extra qgroup check.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Qu Wenruo
2016-12-09 09:19:59 +08:00
committed by Eryu Guan
parent 47bb69de19
commit 180843c1f4
11 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
check
+2 -2
View File
@@ -405,11 +405,11 @@ _check_filesystems()
{
if [ -f ${RESULT_DIR}/require_test ]; then
_check_test_fs || err=true
rm -f ${RESULT_DIR}/require_test
rm -f ${RESULT_DIR}/require_test*
fi
if [ -f ${RESULT_DIR}/require_scratch ]; then
_check_scratch_fs || err=true
rm -f ${RESULT_DIR}/require_scratch
rm -f ${RESULT_DIR}/require_scratch*
fi
}
common/btrfs
+21 -1
View File
@@ -41,6 +41,13 @@ _require_btrfs_command()
[ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param)"
}
# Require extra check on btrfs qgroup numbers
_require_btrfs_qgroup_report()
{
_require_btrfs_command check --qgroup-report
touch ${RESULT_DIR}/require_scratch.require_qgroup_report
}
_run_btrfs_util_prog()
{
run_check $BTRFS_UTIL_PROG $*
@@ -98,7 +105,20 @@ _check_btrfs_filesystem()
mountpoint=`_umount_or_remount_ro $device`
fi
btrfsck $device >$tmp.fsck 2>&1
if [ -f ${RESULT_DIR}/require_scratch.require_qgroup_report ]; then
$BTRFS_UTIL_PROG check $device --qgroup-report > $tmp.qgroup_report 2>&1
if grep -qE "Counts for qgroup.*are different" $tmp.qgroup_report ; then
echo "_check_btrfs_filesystem: filesystem on $device has wrong qgroup numbers (see $seqres.full)"
echo "_check_btrfs_filesystem: filesystem on $device has wrong qgroup numbers" \
>> $seqres.full
echo "*** qgroup_report.$FSTYP output ***" >>$seqres.full
cat $tmp.qgroup_report >>$seqres.full
echo "*** qgroup_report.$FSTYP output ***" >>$seqres.full
fi
rm -f $tmp.qgroup_report
fi
$BTRFS_UTIL_PROG check $device >$tmp.fsck 2>&1
if [ $? -ne 0 ]; then
echo "_check_btrfs_filesystem: filesystem on $device is inconsistent (see $seqres.full)"
common/rc
+3 -2
View File
@@ -1222,8 +1222,9 @@ _notrun()
{
echo "$*" > $seqres.notrun
echo "$seq not run: $*"
rm -f ${RESULT_DIR}/require_test
rm -f ${RESULT_DIR}/require_scratch
rm -f ${RESULT_DIR}/require_test*
rm -f ${RESULT_DIR}/require_scratch*
status=0
exit
}
tests/btrfs/022
+4
View File
@@ -43,6 +43,7 @@ _cleanup()
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
rm -f $seqres.full
@@ -125,16 +126,19 @@ _scratch_mkfs > /dev/null 2>&1
_scratch_mount
_basic_test
_scratch_unmount
_check_scratch_fs
_scratch_mkfs > /dev/null 2>&1
_scratch_mount
_rescan_test
_scratch_unmount
_check_scratch_fs
_scratch_mkfs > /dev/null 2>&1
_scratch_mount
_limit_test_exceed
_scratch_unmount
_check_scratch_fs
_scratch_mkfs > /dev/null 2>&1
_scratch_mount
tests/btrfs/028
+2 -3
View File
@@ -51,6 +51,7 @@ rm -f $seqres.full
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
_scratch_mkfs
_scratch_mount
@@ -86,9 +87,7 @@ _run_btrfs_util_prog filesystem sync $SCRATCH_MNT
_scratch_unmount
# generate a qgroup report and look for inconsistent groups
$BTRFS_UTIL_PROG check --qgroup-report $SCRATCH_DEV 2>&1 | \
grep -E "Counts for qgroup.*are different"
# qgroup will be checked at _check_scratch_fs() by fstest.
echo "Silence is golden"
status=0
tests/btrfs/042
+1
View File
@@ -43,6 +43,7 @@ _cleanup()
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
rm -f $seqres.full
tests/btrfs/099
+1
View File
@@ -46,6 +46,7 @@ _cleanup()
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
# Use big blocksize to ensure there is still enough space left for metadata
# space reserve.
tests/btrfs/104
+5 -15
View File
@@ -58,6 +58,7 @@ rm -f $seqres.full
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
rm -f $seqres.full
@@ -145,21 +146,10 @@ _scratch_cycle_mount
# referenced above.
_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap1
# There is no way from userspace to force btrfs_drop_snapshot to run
# at a given time (even via mount/unmount). We must wait for it to
# start and complete. This is the shortest time on my tests systems I
# have found which always allows drop_snapshot to run to completion.
sleep 45
# "btrfs filesystem sync" will trigger subvolume deletion
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT
_scratch_unmount
# generate a qgroup report and look for inconsistent groups
# - don't use _run_btrfs_util_prog here as it captures the output and
# we need to grep it.
$BTRFS_UTIL_PROG check --qgroup-report $SCRATCH_DEV 2>&1 | \
grep -E -q "Counts for qgroup.*are different"
if [ $? -ne 0 ]; then
status=0
fi
# Qgroup will be checked by fstest at _check_scratch_fs()
status=0
exit
tests/btrfs/122
+3 -6
View File
@@ -49,6 +49,7 @@ rm -f $seqres.full
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
rm -f $seqres.full
@@ -78,11 +79,7 @@ _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/snap2"
_scratch_unmount
# generate a qgroup report and look for inconsistent groups
$BTRFS_UTIL_PROG check --qgroup-report $SCRATCH_DEV 2>&1 | \
grep -q -E "Counts for qgroup.*are different"
if [ $? -ne 0 ]; then
status=0
fi
# qgroup will be checked by fstest at _check_scratch_fs()
status=0
exit
tests/btrfs/123
+2 -3
View File
@@ -53,6 +53,7 @@ rm -f $seqres.full
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
_scratch_mkfs
# Need to use inline extents to fill metadata rapidly
@@ -76,9 +77,7 @@ _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
_run_btrfs_util_prog balance start -d $SCRATCH_MNT
_scratch_unmount
# generate a qgroup report and look for inconsistent groups
$BTRFS_UTIL_PROG check --qgroup-report $SCRATCH_DEV 2>&1 | \
grep -E "Counts for qgroup.*are different"
# qgroup will be check at _check_scratch_fs() by fstest
# success, all done
status=0
tests/btrfs/126
+1
View File
@@ -49,6 +49,7 @@ rm -f $seqres.full
_supported_fs btrfs
_supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
_scratch_mkfs
# Use enospc_debug mount option to trigger restrict space info check