xfs: test xfs_info on block device and mountpoint
PATCH 1/1 xfs: test xfs_info on block device and mountpoint
There was a bug, xfs_info fails on a mounted block device:
# xfs_info /dev/mapper/testdev xfs_info: /dev/mapper/testdev contains a mounted filesystem
fatal error -- couldn't initialize XFS library
xfsprogs has fixed it, this case is used to cover this bug.
Signed-off-by Zorro Lang <[email protected]>
--- tests/xfs/1000 | 65 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1000.out | 2 ++ tests/xfs/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/xfs/1000 create mode 100644 tests/xfs/1000.out
tests/xfs/1000 new file +65 -0
@@ -0,0 +1,65 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 1000 +# +# test xfs_info on block device and mountpoint +# +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.* +} + +# get standard environment, filters and checks +. ./common/rc + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs xfs +_supported_os Linux +_require_scratch + +test_xfs_info() +{ + local target="$1" + local file=$tmp.$seq.info + + $XFS_INFO_PROG $target > $file 2>&1 + if [ $? -ne 0 ];then + echo "$XFS_INFO_PROG $target fails:" + cat $file + else + cat $file >> $seqres.full + fi +} + +_scratch_mkfs > $seqres.full 2>&1 +# test unmounted block device(contains XFS) +# Due to old xfsprogs doesn't support xfs_info a unmounted device, skip it +$XFS_DB_PROG -c "info" $SCRATCH_DEV | grep -q "command info not found" +if [ $? -ne 0 ]; then + test_xfs_info $SCRATCH_DEV +fi + +_scratch_mount +# test mounted block device and mountpoint +test_xfs_info $SCRATCH_DEV +test_xfs_info $SCRATCH_MNT + +echo "Silence is golden" +# success, all done +status=0 +exit
tests/xfs/1000.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 1000 +Silence is golden
tests/xfs/group +1 -0
@@ -504,3 +504,4 @@ 504 auto quick mkfs label 505 auto quick spaceman 506 auto quick health +1000 auto quick
Signature · 1 line
2.17.2
Quoted 57 lines · Zorro Lang
There was a bug,
xfs_infofails on a mounted block device:# xfs_info /dev/mapper/testdev xfs_info: /dev/mapper/testdev contains a mounted filesystemfatal error -- couldn't initialize XFS library
xfsprogs has fixed it, this case is used to cover this bug.
Signed-off-by Zorro Lang <[email protected]>--- tests/xfs/1000 | 65 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1000.out | 2 ++ tests/xfs/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/xfs/1000 create mode 100644 tests/xfs/1000.outtests/xfs/1000 new file +33
-0@@ -0,0 +1,65 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 1000 +# +# test xfs_info on block device and mountpoint +# +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.* +} + +# get standard environment, filters and checks +. ./common/rc + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs xfs +_supported_os Linux +_require_scratch
tests/xfs/1000 line 43
Quoted 10 lines
tests/xfs/1000 new file +10
-0+ +test_xfs_info() +{ + local target="$1" + local file=$tmp.$seq.info + + $XFS_INFO_PROG $target > $file 2>&1 + if [ $? -ne 0 ];then + echo "$XFS_INFO_PROG $target fails:" + cat $file
Should we compare the contents between the two xfs_info invocations?
tests/xfs/1000 line 52
Quoted 9 lines
tests/xfs/1000 new file +9
-0+ else + cat $file >> $seqres.full + fi +} + +_scratch_mkfs > $seqres.full 2>&1 +# test unmounted block device(contains XFS) +# Due to old xfsprogs doesn't support xfs_info a unmounted device, skip it +$XFS_DB_PROG -c "info" $SCRATCH_DEV | grep -q "command info not found"
Does _require_xfs_db_command not work here?
--D
Quoted 33 lines
tests/xfs/1000 new file +13
-0+if [ $? -ne 0 ]; then + test_xfs_info $SCRATCH_DEV +fi + +_scratch_mount +# test mounted block device and mountpoint +test_xfs_info $SCRATCH_DEV +test_xfs_info $SCRATCH_MNT + +echo "Silence is golden" +# success, all done +status=0 +exittests/xfs/1000.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 1000 +Silence is goldentests/xfs/group +1
-0@@ -504,3 +504,4 @@ 504 auto quick mkfs label 505 auto quick spaceman 506 auto quick health +1000 auto quickSignature · 1 line
2.17.2
Quoted 62 lines · Darrick J. Wong
Quoted 61 lines · Zorro Lang
There was a bug,
xfs_infofails on a mounted block device:# xfs_info /dev/mapper/testdev xfs_info: /dev/mapper/testdev contains a mounted filesystemfatal error -- couldn't initialize XFS library
xfsprogs has fixed it, this case is used to cover this bug.
Signed-off-by Zorro Lang <[email protected]>--- tests/xfs/1000 | 65 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1000.out | 2 ++ tests/xfs/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/xfs/1000 create mode 100644 tests/xfs/1000.outtests/xfs/1000 new file +37
-0@@ -0,0 +1,65 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 1000 +# +# test xfs_info on block device and mountpoint +# +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.* +} + +# get standard environment, filters and checks +. ./common/rc + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs xfs +_supported_os Linux +_require_scratch + +test_xfs_info() +{ + local target="$1"
Quoted 8 lines
tests/xfs/1000 line 43
Quoted 6 lines
tests/xfs/1000 new file +6
-0+ local file=$tmp.$seq.info + + $XFS_INFO_PROG $target > $file 2>&1 + if [ $? -ne 0 ];then + echo "$XFS_INFO_PROG $target fails:" + cat $fileShould we compare the contents between the two
xfs_infoinvocations?
Hmm, make sense!
Quoted 12 lines
tests/xfs/1000 line 52
Quoted 10 lines
tests/xfs/1000 new file +9
-0+ else + cat $file >> $seqres.full + fi +} + +_scratch_mkfs > $seqres.full 2>&1 +# test unmounted block device(contains XFS) +# Due to old xfsprogs doesn't support xfs_info a unmounted device, skip it +$XFS_DB_PROG -c "info" $SCRATCH_DEV | grep -q "command info not found"Does
_require_xfs_db_commandnot work here?
Wow, I forgot it, thanks for reminding:)
Quoted 36 lines
--D
Quoted 33 lines
tests/xfs/1000 new file +13
-0+if [ $? -ne 0 ]; then + test_xfs_info $SCRATCH_DEV +fi + +_scratch_mount +# test mounted block device and mountpoint +test_xfs_info $SCRATCH_DEV +test_xfs_info $SCRATCH_MNT + +echo "Silence is golden" +# success, all done +status=0 +exittests/xfs/1000.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 1000 +Silence is goldentests/xfs/group +1
-0@@ -504,3 +504,4 @@ 504 auto quick mkfs label 505 auto quick spaceman 506 auto quick health +1000 auto quickSignature · 1 line
2.17.2
Quoted 8 lines · Zorro Lang
There was a bug,
xfs_infofails on a mounted block device:# xfs_info /dev/mapper/testdev xfs_info: /dev/mapper/testdev contains a mounted filesystemfatal error -- couldn't initialize XFS library
xfsprogs has fixed it, this case is used to cover this bug.
Would you please document the commit that fixed this bug in test description?
Quoted 5 lines
Signed-off-by Zorro Lang <[email protected]>--- tests/xfs/1000 | 65 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1000.out | 2 ++
I find it easier if you just pick the next free seq number :) If there's no conflict I can just apply the patch, and if there's conflict I'll do manual edit anyway.
Quoted 53 lines
tests/xfs/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/xfs/1000 create mode 100644 tests/xfs/1000.outtests/xfs/1000 new file +42
-0@@ -0,0 +1,65 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 1000 +# +# test xfs_info on block device and mountpoint +# +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.* +} + +# get standard environment, filters and checks +. ./common/rc + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs xfs +_supported_os Linux +_require_scratch + +test_xfs_info() +{ + local target="$1" + local file=$tmp.$seq.info + + $XFS_INFO_PROG $target > $file 2>&1 + if [ $? -ne 0 ];then + echo "$XFS_INFO_PROG $target fails:"
tests/xfs/1000 line 52
Quoted 10 lines
tests/xfs/1000 new file +10
-0+ cat $file + else + cat $file >> $seqres.full + fi +} + +_scratch_mkfs > $seqres.full 2>&1 +# test unmounted block device(contains XFS) +# Due to old xfsprogs doesn't support xfs_info a unmounted device, skip it +$XFS_DB_PROG -c "info" $SCRATCH_DEV | grep -q "command info not found"
Better to explain why xfs_db is used here instead of xfs_info.
tests/xfs/1000 line 55
Quoted 3 lines
tests/xfs/1000 new file +3
-0+if [ $? -ne 0 ]; then + test_xfs_info $SCRATCH_DEV +fi
And I'd suggest move this test to the end (after umount the scratch dev) so we're sure the device contains a valid xfs (which has just been mounted & umounted).
Thanks,
Eryu
Quoted 30 lines
tests/xfs/1000 new file +10
-0+ +_scratch_mount +# test mounted block device and mountpoint +test_xfs_info $SCRATCH_DEV +test_xfs_info $SCRATCH_MNT + +echo "Silence is golden" +# success, all done +status=0 +exittests/xfs/1000.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 1000 +Silence is goldentests/xfs/group +1
-0@@ -504,3 +504,4 @@ 504 auto quick mkfs label 505 auto quick spaceman 506 auto quick health +1000 auto quickSignature · 1 line
2.17.2