# try again without MKFS_OPTIONS because that's what _scratch_do_mkfs
# will do if we pass in the log size option.
if [ $mkfs_status -ne 0 ] &&
- ! grep -q 'log size.*too small, minimum' $tmp.mkfserr; then
+ ! egrep -q '(log size.*too small, minimum|external log device.*too small, must be)' $tmp.mkfserr; then
eval "$mkfs_cmd $extra_mkfs_options $SCRATCH_DEV" \
2>$tmp.mkfserr 1>$tmp.mkfsstd
mkfs_status=$?
rm -f $tmp.mkfsstd $tmp.mkfserr
return
fi
+ if grep -q 'external log device.*too small, must be' $tmp.mkfserr; then
+ grep 'external log device.*too small, must be' $tmp.mkfserr | \
+ sed -e 's/^.*must be at least \([0-9]*\) blocks/\1/g'
+ rm -f $tmp.mkfsstd $tmp.mkfserr
+ return
+ fi
# Don't know what to do, so fail
echo "Cannot determine minimum log size" >&2
return $mkfs_status
}
+# Get the size of an allocation unit of a file. Normally this is just the
+# block size of the file, but for realtime files, this is the realtime extent
+# size.
+_xfs_get_file_block_size()
+{
+ local path="$1"
+
+ if ! ($XFS_IO_PROG -c "stat -v" "$path" 2>&1 | egrep -q '(rt-inherit|realtime)'); then
+ _get_block_size "$path"
+ return
+ fi
+
+ # Otherwise, call xfs_info until we find a mount point or the root.
+ path="$(readlink -m "$path")"
+ while ! $XFS_INFO_PROG "$path" &>/dev/null && [ "$path" != "/" ]; do
+ path="$(dirname "$path")"
+ done
+ $XFS_INFO_PROG "$path" | grep realtime | sed -e 's/^.*extsz=\([0-9]*\).*$/\1/g'
+}
+
# xfs_check script is planned to be deprecated. But, we want to
# be able to invoke "xfs_check" behavior in xfstests in order to
# maintain the current verification levels.
return 0
}
+# Save a snapshot of a corrupt xfs filesystem for later debugging.
+_xfs_metadump() {
+ local metadump="$1"
+ local device="$2"
+ local logdev="$3"
+ local compressopt="$4"
+ shift; shift; shift; shift
+ local options="$@"
+ test -z "$options" && options="-a -o"
+
+ if [ "$logdev" != "none" ]; then
+ options="$options -l $logdev"
+ fi
+
+ $XFS_METADUMP_PROG $options "$device" "$metadump"
+ res=$?
+ [ "$compressopt" = "compress" ] && [ -n "$DUMP_COMPRESSOR" ] &&
+ $DUMP_COMPRESSOR "$metadump" &> /dev/null
+ return $res
+}
+
# run xfs_check and friends on a FS.
_check_xfs_filesystem()
{
extra_options="-f"
fi
- if [ "$2" != "none" ]; then
- extra_log_options="-l$2"
- extra_mount_options="-ologdev=$2"
+ local logdev="$2"
+ if [ "$logdev" != "none" ]; then
+ extra_log_options="-l$logdev"
+ extra_mount_options="-ologdev=$logdev"
fi
- if [ "$3" != "none" ]; then
- extra_rt_options="-r$3"
- extra_mount_options=$extra_mount_options" -ortdev=$3"
+ local rtdev="$3"
+ if [ "$rtdev" != "none" ]; then
+ extra_rt_options="-r$rtdev"
+ extra_mount_options=$extra_mount_options" -ortdev=$rtdev"
fi
extra_mount_options=$extra_mount_options" $MOUNT_OPTIONS"
$XFS_LOGPRINT_PROG -t $extra_log_options $device 2>&1 \
| tee $tmp.logprint | grep -q "<CLEAN>"
- if [ $? -ne 0 -a "$HOSTOS" = "Linux" ]; then
+ if [ $? -ne 0 ]; then
_log_err "_check_xfs_filesystem: filesystem on $device has dirty log"
echo "*** xfs_logprint -t output ***" >>$seqres.full
cat $tmp.logprint >>$seqres.full
fi
rm -f $tmp.fs_check $tmp.logprint $tmp.repair
+ if [ "$ok" -ne 1 ] && [ "$DUMP_CORRUPT_FS" = "1" ]; then
+ local flatdev="$(basename "$device")"
+ _xfs_metadump "$seqres.$flatdev.check.md" "$device" "$logdev" \
+ compress >> $seqres.full
+ fi
+
# Optionally test the index rebuilding behavior.
if [ -n "$TEST_XFS_REPAIR_REBUILD" ]; then
+ rebuild_ok=1
$XFS_REPAIR_PROG $extra_options $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
if [ $? -ne 0 ]; then
_log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild)"
echo "*** end xfs_repair output" >>$seqres.full
ok=0
+ rebuild_ok=0
fi
rm -f $tmp.repair
echo "*** end xfs_repair output" >>$seqres.full
ok=0
+ rebuild_ok=0
fi
rm -f $tmp.repair
+
+ if [ "$rebuild_ok" -ne 1 ] && [ "$DUMP_CORRUPT_FS" = "1" ]; then
+ local flatdev="$(basename "$device")"
+ _xfs_metadump "$seqres.$flatdev.rebuild.md" "$device" \
+ "$logdev" compress >> $seqres.full
+ fi
fi
if [ $ok -eq 0 ]; then
|| _notrun "need case-insensitive naming support in mkfs.xfs"
}
+# this test requires mkfs.xfs have configuration file support
+_require_xfs_mkfs_cfgfile()
+{
+ echo > /tmp/a
+ _scratch_mkfs_xfs_supported -c options=/tmp/a >/dev/null 2>&1
+ res=$?
+ rm -rf /tmp/a
+ test $res -eq 0 || _notrun "need configuration file support in mkfs.xfs"
+}
+
# XFS_DEBUG requirements
_require_xfs_debug()
{