From 876161d54479c2edb3339bc9fd7598b36fac5a71 Mon Sep 17 00:00:00 2001 From: Brian Foster Date: Mon, 21 Dec 2015 17:59:04 +1100 Subject: [PATCH] xfs: test xfsprogs log formatting infrastructure The xfsprogs libxfs layer implements its own log formatting code to support utilities that might need to format the log, such as mkfs, repair, metadump, etc. This code is fairly independent from kernel log writing code. Therefore, add a test that reformats the log from userspace with various supported log stripe unit alignments and verifies that the end result is a correctly formatted log. Signed-off-by: Brian Foster Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- common/rc | 14 ++++++++++ tests/xfs/135 | 71 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/135.out | 6 ++++ tests/xfs/group | 1 + 4 files changed, 92 insertions(+) create mode 100755 tests/xfs/135 create mode 100644 tests/xfs/135.out diff --git a/common/rc b/common/rc index d901aaa1..c825229a 100644 --- a/common/rc +++ b/common/rc @@ -1656,6 +1656,20 @@ _require_xfs_io_command() _notrun "xfs_io $command failed (old kernel/wrong fs?)" } +# check that xfs_db supports a specific command +_require_xfs_db_command() +{ + if [ $# -ne 1 ] + then + echo "Usage: _require_xfs_db_command command" 1>&2 + exit 1 + fi + command=$1 + + $XFS_DB_PROG -x -c "help" $SCRATCH_DEV | grep $command > /dev/null || \ + _notrun "xfs_db $command support is missing" +} + # check that kernel and filesystem support direct I/O _require_odirect() { diff --git a/tests/xfs/135 b/tests/xfs/135 new file mode 100755 index 00000000..0487f0e7 --- /dev/null +++ b/tests/xfs/135 @@ -0,0 +1,71 @@ +#! /bin/bash +# FS QA Test No. 135 +# +# This test verifies that the xfsprogs log formatting infrastructure works +# correctly for various log stripe unit values. The log is formatted with xfs_db +# and verified with xfs_logprint. +# +#----------------------------------------------------------------------- +# Copyright (c) 2015 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! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +rm -f $seqres.full + +# get standard environment, filters and checks +. ./common/rc +. ./common/log + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_scratch +_require_v2log +_require_xfs_db_command "logformat" + +_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed" + +# Reformat the log with various log stripe unit sizes and see if logprint dumps +# any errors. Use a cycle value larger than 1 so the log is actually written +# (the log is zeroed when cycle == 1). +for i in 16 32 64 128 256; do + lsunit=$((i * 1024)) + $XFS_DB_PROG -x -c "logformat -c 3 -s $lsunit" $SCRATCH_DEV | \ + tee -a $seqres.full + # don't redirect error output so it causes test failure + $XFS_LOGPRINT_PROG $SCRATCH_DEV >> $seqres.full +done + +# success, all done +status=0 +exit diff --git a/tests/xfs/135.out b/tests/xfs/135.out new file mode 100644 index 00000000..115cfcd1 --- /dev/null +++ b/tests/xfs/135.out @@ -0,0 +1,6 @@ +QA output created by 135 +Formatting the log to cycle 3, stripe unit 16384 bytes. +Formatting the log to cycle 3, stripe unit 32768 bytes. +Formatting the log to cycle 3, stripe unit 65536 bytes. +Formatting the log to cycle 3, stripe unit 131072 bytes. +Formatting the log to cycle 3, stripe unit 262144 bytes. diff --git a/tests/xfs/group b/tests/xfs/group index 9884329f..65507028 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -131,6 +131,7 @@ 131 auto quick clone 132 auto quick clone 134 quota auto quick +135 auto logprint quick v2log 136 attr2 142 dmapi 143 dmapi -- 2.39.5