xfstests: fixes for the free inode btree

index af03166..a43455f 100755
@@ -56,7 +56,8 @@ _check_ag()
 	do
 		echo "Corrupting $structure - setting bits to $1"
 		_check_repair $1 "$structure" |
-			sed -e '/^error following ag 0 unlinked list$/d'
+			sed -e '/^error following ag 0 unlinked list$/d' \
+			    -e '/^bad agbno AGBNO for finobt/d'
 	done
 }
 

index 5c13db5..66a3cb8 100644
@@ -1113,6 +1113,24 @@ _require_xfs_crc()
 	umount $SCRATCH_MNT
 }
 
+# this test requires the finobt feature to be available in mkfs.xfs
+#
+_require_xfs_mkfs_finobt()
+{
+	_scratch_mkfs_xfs_supported -m crc=1,finobt=1 >/dev/null 2>&1 \
+	   || _notrun "mkfs.xfs doesn't have finobt feature"
+}
+
+# this test requires the xfs kernel support finobt feature
+#
+_require_xfs_finobt()
+{
+	_scratch_mkfs_xfs -m crc=1,finobt=1 >/dev/null 2>&1
+	_scratch_mount >/dev/null 2>&1 \
+	   || _notrun "Kernel doesn't support finobt feature"
+	umount $SCRATCH_MNT
+}
+
 # this test requires that external log/realtime devices are not in use
 #
 _require_nonexternal()

index 3e73c1d..46ca9e0 100644
@@ -83,6 +83,8 @@ s/\s+- \d+:\d\d:\d\d:.*\n//g;
 /^Metadata corruption detected/ && next;
 /^Metadata CRC error detected/ && next;
 /^agfl has bad CRC/ && next;
+# finobt enabled filesystem output
+s/(inode chunk) (\d+)\/(\d+)/AGNO\/INO/;
 	print;'
 }
 

new file mode 100755
index 0000000..2b5ad00
@@ -0,0 +1,133 @@
+#!/bin/bash
+# FS QA Test No. xfs/010
+#
+# Test xfs_repair of the free inode btree (finobt). Make a couple targeted
+# corruptions and verify that xfs_repair detects and repairs the filesystem to
+# a consistent state.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2014 Red Hat, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1	# failure is the default!
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/repair
+
+_cleanup()
+{
+	cd /
+	umount $SCRATCH_MNT 2>/dev/null
+	rm -f $tmp.*
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_sparse_inode_populate()
+{
+	dir=$1
+	count=$2
+
+	for i in $(seq 0 $count)
+	do
+		touch $dir/$i
+	done
+
+	# Inode chunks are allocated 64 inodes at a time. If we remove 1 out of
+	# every 32 we allocated above, we'll end up leaving an inode or two free
+	# in each chunk. This ensures that most records are inserted into the
+	# finobt.
+	for i in $(seq 0 32 $count)
+	do
+		rm -f $dir/$i
+	done
+}
+
+_filter_dbval()
+{
+	awk '{ print $3 }'
+}
+
+_corrupt_finobt_records()
+{
+	dev=$1
+
+	# determine the root block of the finobt
+	free_root=`$XFS_DB_PROG -c "agi 0" -c "p free_root" $dev |
+			_filter_dbval`
+
+	# Corrupt a freecount value. This should never exceed 64.
+	$XFS_DB_PROG -x -c "fsb $free_root" -c "type inobt" \
+		-c "write recs[1].freecount 70" $dev
+
+	# Create a corrupted non-free record, which should never appear in the
+	# finobt.
+	$XFS_DB_PROG -x -c "fsb $free_root" -c "type inobt" \
+		 -c "write recs[2].freecount 0" $dev
+	$XFS_DB_PROG -x -c "fsb $free_root" -c "type inobt" \
+		-c "write recs[2].free 0" $dev
+}
+
+_corrupt_finobt_root()
+{
+	dev=$1
+
+	# nuke the agi finobt root fields
+	$XFS_DB_PROG -x -c "agi 0" -c "write free_root 0" $dev
+	$XFS_DB_PROG -x -c "agi 0" -c "write free_level 0" $dev
+}
+
+# real QA test starts here
+_supported_fs xfs
+_supported_os Linux
+
+_require_scratch
+_require_xfs_mkfs_finobt
+_require_xfs_finobt
+
+rm -f $seqres.full
+
+_scratch_mkfs_xfs "-m crc=1,finobt=1 -d agcount=2" | _filter_mkfs 2>$seqres.full
+
+# sparsely populate the fs such that we create records with free inodes
+_scratch_mount
+_sparse_inode_populate $SCRATCH_MNT 999
+umount $SCRATCH_MNT
+
+# corrupt some finobt records
+_corrupt_finobt_records $SCRATCH_DEV
+
+# repair should detect the inconsistencies
+_scratch_xfs_repair 2>&1 | _filter_repair
+_check_scratch_fs
+
+# nuke the finobt root, repair will have to regenerate from the inobt
+_corrupt_finobt_root $SCRATCH_DEV
+
+_scratch_xfs_repair 2>&1 | _filter_repair
+_check_scratch_fs
+
+status=0
+exit

57 lines not on this page · raw message

index 4624fc3..c228a63 100644
@@ -7,6 +7,7 @@
 007 auto quota quick
 008 rw ioctl auto quick
 009 rw ioctl auto prealloc quick
+010 auto quick repair
 012 rw auto quick
 016 rw auto quick
 017 mount auto quick stress

new file mode 100755
index 0000000..049f0dc
@@ -0,0 +1,155 @@
+#!/bin/bash
+# FS QA Test No. xfs/013
+#
+# Exercise the free inode btree (finobt). XFS allocates physical inodes in
+# chunks of 64. Inode records with at least one free inode are stored in the
+# finobt to optimize free inode lookup. This test runs a workload that creates
+# and modifies a sparsely allocated set of inodes in combination with an
+# fsstress workload.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2014 Red Hat, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1	# failure is the default!
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+_cleanup()
+{
+	killall fsstress 2>/dev/null
+	cd /
+	umount $SCRATCH_MNT 2>/dev/null
+	rm -f $tmp.*
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_create()
+{
+	dir=$1
+	count=$2
+
+	mkdir -p $dir
+	for i in $(seq 0 $count)
+	do
+		touch $dir/$i
+	done
+}
+
+_rand_replace()
+{
+	dir=$1
+	count=$2
+
+	# replace 5% of the dataset
+	for i in $(seq 0 $((count / 20)))
+	do
+		file=$((RANDOM % count))
+		rm -f $dir/$file
+		touch $dir/$file
+	done
+}
+
+_cleaner()
+{
+	dir=$1
+	iters=$2
+	mindirs=$3
+
+	iters=$((iters - mindirs))
+
+	for i in $(seq 1 $iters)
+	do
+		need=$dir/dir$((i + mindirs))
+		while [ ! -e $need ]
+		do
+			sleep 3
+		done
+
+		rm -rf $dir/dir$i
+	done
+}
+
+# real QA test starts here
+_supported_fs xfs
+_supported_os Linux
+
+_require_scratch
+_require_xfs_mkfs_finobt
+_require_xfs_finobt
+
+rm -f $seqres.full
+
+_scratch_mkfs_xfs "-m crc=1,finobt=1 -d agcount=2" | \
+	_filter_mkfs 2>> $seqres.full
+_scratch_mount
+
+COUNT=20000	# number of files per directory
+LOOPS=15	# last loop iteration
+MINDIRS=2	# number of dirs for the cleaner to leave trailing behind the
+		# most recent (no less than 2 to prevent an rm from trampling a
+		# clone)
+
+# create initial directory
+_create $SCRATCH_MNT/dir1 $COUNT
+
+# start background cleaner to remove old directories as new ones are created
+_cleaner $SCRATCH_MNT $LOOPS $MINDIRS &
+
+# start a background stress workload on the fs
+$FSSTRESS_PROG -d $SCRATCH_MNT/fsstress -w -n 9999999 -p 2 -S t \
+	>> $seqres.full 2>&1 &
+
+# Each cycle clones the current directory and makes a random file replacement
+# pass on the new directory. The directory is copied to the next using hard
+# links. The replacement pass then randomly removes and replaces ~5% of the
+# content in the directory. Files replaced as such are effectively marked to be
+# freed by the background cleaner as it moves forward and removes all of the
+# previous hard links to the inode. Over several iterations, this workload
+# creates a sparsely located set of a free inodes across the set and uses the
+# finobt to allocate new inodes for replacement.
+
+for i in $(seq 1 $LOOPS)
+do
+	# hard link the content of the current directory to the next
+	cp -Rl $SCRATCH_MNT/dir$i $SCRATCH_MNT/dir$((i+1))
+
+	# do a random replacement of files in the new directory
+	_rand_replace $SCRATCH_MNT/dir$((i+1)) $COUNT
+done
+
+killall fsstress
+wait
+
+# clean out the competing fsstress allocations, then everything else
+rm -rf $SCRATCH_MNT/fsstress
+rm -rf $SCRATCH_MNT/dir*
+
+umount $SCRATCH_MNT
+_check_scratch_fs
+
+status=0
+exit

new file mode 100644
index 0000000..ae653ff
@@ -0,0 +1,7 @@
+QA output created by 013
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX

index c228a63..0fa6674 100644
@@ -9,6 +9,7 @@
 009 rw ioctl auto prealloc quick
 010 auto quick repair
 012 rw auto quick
+013 stress
 016 rw auto quick
 017 mount auto quick stress
 018 deprecated # log logprint v2log