add seed delete test case and fix btrfs/163
PATCH v3 1/2 btrfs: add a test case for btrfs seed device delete
In reply to Anand JainThis is a regression test for the issue fixed by the kernel commit b5ddcffa3777 (btrfs: fix put of uninitialized kobject after seed device delete).
In this test case, we verify the seed device delete on a sprouted filesystem.
---
v3: Add commit id for the kernel patch mentioned in the change log and the header.
Fix to _supported_fs btrfs
Drop _supported_os Linux
Use define AWK_PROG
Drop the directIO in xfs_io it has no use
Make it a new test case 225
v2: drop the sysfs layout check as it breaks the test-case backward compatibility.
tests/btrfs/225 | 82 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/225.out | 15 +++++++++ tests/btrfs/group | 1 + 3 files changed, 98 insertions(+) create mode 100755 tests/btrfs/225 create mode 100644 tests/btrfs/225.out
tests/btrfs/225 new file +82 -0
@@ -0,0 +1,82 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Oracle. All Rights Reserved. +# +# FS QA Test 225 +# +# Test for seed device-delete on a sprouted FS. +# Requires kernel patch +# b5ddcffa3777 btrfs: fix put of uninitialized kobject after seed device delete +# +# Steps: +# Create a seed FS. Add a RW device to make it sprout FS and then delete +# the seed device. + +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 +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_require_test +_require_scratch_dev_pool 2 + +_scratch_dev_pool_get 2 + +seed=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}') +sprout=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}') + +_mkfs_dev $seed +_mount $seed $SCRATCH_MNT + +$XFS_IO_PROG -f -c "pwrite -S 0xab 0 1M" $SCRATCH_MNT/foo > /dev/null +_scratch_unmount +$BTRFS_TUNE_PROG -S 1 $seed + +# Mount the seed device and add the rw device +_mount -o ro $seed $SCRATCH_MNT +$BTRFS_UTIL_PROG device add -f $sprout $SCRATCH_MNT +_scratch_unmount + +# Now remount +_mount $sprout $SCRATCH_MNT +$XFS_IO_PROG -f -c "pwrite -S 0xcd 0 1M" $SCRATCH_MNT/bar > /dev/null + +echo --- before delete ---- +od -x $SCRATCH_MNT/foo +od -x $SCRATCH_MNT/bar + +$BTRFS_UTIL_PROG device delete $seed $SCRATCH_MNT +_scratch_unmount +_btrfs_forget_or_module_reload +_mount $sprout $SCRATCH_MNT + +echo --- after delete ---- +od -x $SCRATCH_MNT/foo +od -x $SCRATCH_MNT/bar + +_scratch_dev_pool_put + +# success, all done +status=0 +exit
tests/btrfs/225.out new file +15 -0
@@ -0,0 +1,15 @@ +QA output created by 225 +--- before delete ---- +0000000 abab abab abab abab abab abab abab abab +* +4000000 +0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd +* +4000000 +--- after delete ---- +0000000 abab abab abab abab abab abab abab abab +* +4000000 +0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd +* +4000000
tests/btrfs/group +1 -0
@@ -226,3 +226,4 @@ 222 auto quick send 223 auto quick replace trim 224 auto quick qgroup +225 auto quick volume seed
Signature · 1 line
2.25.1
PATCH v3 2/2 btrfs/163: replace sprout instead of seed
In reply to Anand JainMake this test case inline with the kernel patch [1] changes
[1] c6a5d954950c btrfs: fix replace of seed device
So use the sprout device as the replace target instead of the seed device. This change is compatible with the older kernels.
While at this, this patch also fixes a typo fix as well.
---
v3:
add kernel commit id in the change log and in the header. remove directio in xfs_io.
rename replace_seed() to replace_sprout().
v2:
none
tests/btrfs/163 | 25 ++++++++++++++++++------- tests/btrfs/163.out | 5 ++++- 2 files changed, 22 insertions(+), 8 deletions(-)
tests/btrfs/163 +18 -7
@@ -4,11 +4,15 @@ # # FS QA Test 163 # -# Test case to verify that a seed device can be replaced +# Test case to verify that a sprouted device can be replaced # Create a seed device # Create a sprout device # Remount RW -# Run device replace on the seed device +# Run device replace on the sprout device +# +# Depends on the kernel patch +# c6a5d954950c btrfs: fail replace of seed device + seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq"
@@ -38,6 +42,7 @@ rm -f $seqres.full _supported_fs btrfs _require_command "$BTRFS_TUNE_PROG" btrfstune _require_scratch_dev_pool 3 +_require_btrfs_forget_or_module_loadable _scratch_dev_pool_get 3
@@ -51,7 +56,7 @@ create_seed() run_check _mount $dev_seed $SCRATCH_MNT $XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 4M" $SCRATCH_MNT/foobar >\ /dev/null - echo -- gloden -- + echo -- golden -- od -x $SCRATCH_MNT/foobar _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT _scratch_unmount
@@ -63,22 +68,28 @@ add_sprout() { _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _mount -o remount,rw $dev_sprout $SCRATCH_MNT + $XFS_IO_PROG -f -c "pwrite -S 0xcd 0 4M" $SCRATCH_MNT/foobar2 >\ + /dev/null } -replace_seed() +replace_sprout() { - _run_btrfs_util_prog replace start -fB $dev_seed $dev_replace_tgt $SCRATCH_MNT + _run_btrfs_util_prog replace start -fB $dev_sprout $dev_replace_tgt $SCRATCH_MNT _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT _scratch_unmount - run_check _mount $dev_replace_tgt $SCRATCH_MNT + _btrfs_forget_or_module_reload + run_check _mount -o device=$dev_seed $dev_replace_tgt $SCRATCH_MNT echo -- sprout -- od -x $SCRATCH_MNT/foobar + od -x $SCRATCH_MNT/foobar2 _scratch_unmount } seed_is_mountable() { + _btrfs_forget_or_module_reload run_check _mount $dev_seed $SCRATCH_MNT _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT _scratch_unmount
@@ -86,7 +97,7 @@ seed_is_mountable() create_seed add_sprout -replace_seed +replace_sprout seed_is_mountable
tests/btrfs/163.out +4 -1
@@ -1,5 +1,5 @@ QA output created by 163 --- gloden -- +-- golden -- 0000000 abab abab abab abab abab abab abab abab * 20000000
@@ -7,3 +7,6 @@ QA output created by 163 0000000 abab abab abab abab abab abab abab abab * 20000000 +0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd +* +20000000
Signature · 1 line
2.25.1
v3 cover add seed delete test case and fix btrfs/163
Anand Jain (2):
btrfs: add a test case for btrfs seed device delete btrfs/163: replace sprout instead of seed
tests/btrfs/163 | 25 ++++++++++---- tests/btrfs/163.out | 5 ++- tests/btrfs/225 | 82 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/225.out | 15 +++++++++ tests/btrfs/group | 1 + 5 files changed, 120 insertions(+), 8 deletions(-) create mode 100755 tests/btrfs/225 create mode 100644 tests/btrfs/225.out
Signature · 1 line
2.25.1
Re: [PATCH v3 1/2] btrfs: add a test case for btrfs seed device delete
In reply to Anand JainQuoted 9 lines · Anand Jain
This is a regression test for the issue fixed by the kernel commit
b5ddcffa3777(btrfs: fix put of uninitialized kobject after seed device delete).In this test case, we verify the seed device delete on a sprouted filesystem.
Signed-off-by Anand Jain <[email protected]>
Looks good, thanks.
Quoted 140 lines
---
v3: Add commit id for the kernel patch mentioned in the change log and the header.
Fix to_supported_fsbtrfs
Drop_supported_osLinux
Use defineAWK_PROG
Drop the directIO inxfs_ioit has no use
Make it a new test case 225v2: drop the sysfs layout check as it breaks the test-case backward compatibility.
tests/btrfs/225 | 82 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/225.out | 15 +++++++++ tests/btrfs/group | 1 + 3 files changed, 98 insertions(+) create mode 100755 tests/btrfs/225 create mode 100644 tests/btrfs/225.outtests/btrfs/225 new file +82
-0@@ -0,0 +1,82 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Oracle. All Rights Reserved. +# +# FS QA Test 225 +# +# Test for seed device-delete on a sprouted FS. +# Requires kernel patch +# b5ddcffa3777 btrfs: fix put of uninitialized kobject after seed device delete +# +# Steps: +# Create a seed FS. Add a RW device to make it sprout FS and then delete +# the seed device. + +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 +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_require_test +_require_scratch_dev_pool 2 + +_scratch_dev_pool_get 2 + +seed=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $1}') +sprout=$(echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}') + +_mkfs_dev $seed +_mount $seed $SCRATCH_MNT + +$XFS_IO_PROG -f -c "pwrite -S 0xab 0 1M" $SCRATCH_MNT/foo > /dev/null +_scratch_unmount +$BTRFS_TUNE_PROG -S 1 $seed + +# Mount the seed device and add the rw device +_mount -o ro $seed $SCRATCH_MNT +$BTRFS_UTIL_PROG device add -f $sprout $SCRATCH_MNT +_scratch_unmount + +# Now remount +_mount $sprout $SCRATCH_MNT +$XFS_IO_PROG -f -c "pwrite -S 0xcd 0 1M" $SCRATCH_MNT/bar > /dev/null + +echo --- before delete ---- +od -x $SCRATCH_MNT/foo +od -x $SCRATCH_MNT/bar + +$BTRFS_UTIL_PROG device delete $seed $SCRATCH_MNT +_scratch_unmount +_btrfs_forget_or_module_reload +_mount $sprout $SCRATCH_MNT + +echo --- after delete ---- +od -x $SCRATCH_MNT/foo +od -x $SCRATCH_MNT/bar + +_scratch_dev_pool_put + +# success, all done +status=0 +exittests/btrfs/225.out new file +15
-0@@ -0,0 +1,15 @@ +QA output created by 225 +--- before delete ---- +0000000 abab abab abab abab abab abab abab abab +* +4000000 +0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd +* +4000000 +--- after delete ---- +0000000 abab abab abab abab abab abab abab abab +* +4000000 +0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd +* +4000000tests/btrfs/group +1
-1@@ -226,3 +226,4 @@ 222 auto quick send 223 auto quick replace trim 224 auto quick qgroup +225 auto quick volume seed --2.25.1
Signature · 3 lines
Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”
Re: [PATCH v3 2/2] btrfs/163: replace sprout instead of seed
In reply to Anand JainQuoted 10 lines · Anand Jain
Make this test case inline with the kernel patch [1] changes
[1]c6a5d954950cbtrfs: fix replace of seed deviceSo use the sprout device as the replace target instead of the seed device. This change is compatible with the older kernels.
While at this, this patch also fixes a typo fix as well.
Signed-off-by Anand Jain <[email protected]>
Looks good, thanks.
Quoted 114 lines
---
v3:
add kernel commit id in the change log and in the header. remove directio inxfs_io.
renamereplace_seed()toreplace_sprout().v2:
nonetests/btrfs/163 | 25 ++++++++++++++++++------- tests/btrfs/163.out | 5 ++++- 2 files changed, 22 insertions(+), 8 deletions(-)tests/btrfs/163 +18
-7@@ -4,11 +4,15 @@ # # FS QA Test 163 # -# Test case to verify that a seed device can be replaced +# Test case to verify that a sprouted device can be replaced # Create a seed device # Create a sprout device # Remount RW -# Run device replace on the seed device +# Run device replace on the sprout device +# +# Depends on the kernel patch +# c6a5d954950c btrfs: fail replace of seed device + seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq"@@ -38,6 +42,7 @@ rm -f $seqres.full _supported_fs btrfs _require_command "$BTRFS_TUNE_PROG" btrfstune _require_scratch_dev_pool 3 +_require_btrfs_forget_or_module_loadable _scratch_dev_pool_get 3@@ -51,7 +56,7 @@ create_seed() run_check _mount $dev_seed $SCRATCH_MNT $XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 4M" $SCRATCH_MNT/foobar >\ /dev/null - echo -- gloden -- + echo -- golden -- od -x $SCRATCH_MNT/foobar _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT _scratch_unmount@@ -63,22 +68,28 @@ add_sprout() { _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _mount -o remount,rw $dev_sprout $SCRATCH_MNT + $XFS_IO_PROG -f -c "pwrite -S 0xcd 0 4M" $SCRATCH_MNT/foobar2 >\ + /dev/null } -replace_seed() +replace_sprout() { - _run_btrfs_util_prog replace start -fB $dev_seed $dev_replace_tgt $SCRATCH_MNT + _run_btrfs_util_prog replace start -fB $dev_sprout $dev_replace_tgt $SCRATCH_MNT _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT _scratch_unmount - run_check _mount $dev_replace_tgt $SCRATCH_MNT + _btrfs_forget_or_module_reload + run_check _mount -o device=$dev_seed $dev_replace_tgt $SCRATCH_MNT echo -- sprout -- od -x $SCRATCH_MNT/foobar + od -x $SCRATCH_MNT/foobar2 _scratch_unmount } seed_is_mountable() { + _btrfs_forget_or_module_reload run_check _mount $dev_seed $SCRATCH_MNT _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT _scratch_unmount@@ -86,7 +97,7 @@ seed_is_mountable() create_seed add_sprout -replace_seed +replace_sprout seed_is_mountabletests/btrfs/163.out +4
-2@@ -1,5 +1,5 @@ QA output created by 163 --- gloden -- +-- golden -- 0000000 abab abab abab abab abab abab abab abab * 20000000@@ -7,3 +7,6 @@ QA output created by 163 0000000 abab abab abab abab abab abab abab abab * 20000000 +0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd +* +20000000 --2.25.1
Signature · 3 lines
Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”