[PATCH] fstests: btrfs/161: extend the test case to delete seed

[PATCH] fstests: btrfs/161: extend the test case to delete seed

[Anand Jain]

This test case btrfs/161 does the sprout tests, so after sprout
this patch deletes the seed to verify.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/161     | 16 ++++++++++++++--
 tests/btrfs/161.out |  4 ++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/btrfs/161 b/tests/btrfs/161
index dfff8b871fa3..feaa7a4de6c2 100755
--- a/tests/btrfs/161
+++ b/tests/btrfs/161
@@ -5,9 +5,13 @@
 # FS QA Test 161
 #
 # seed sprout functionality test
-#  Create a seed device, mount it and, add a new device to create a
-#  sprout filesystem.
+#  Create seed
+#  Create sprout
+#  Delete seed
 #
+# The null kobject free warning is address by the kernel patch
+#   btrfs: initialize sysfs devid and device link for seed device
+
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -64,11 +68,19 @@ create_sprout()
 	run_check _mount $dev_sprout $SCRATCH_MNT
 	echo -- sprout --
 	od -x $SCRATCH_MNT/foobar
+}
+
+delete_seed()
+{
+	$BTRFS_UTIL_PROG device delete $dev_seed $SCRATCH_MNT
+	echo -- seed removed --
+	od -x $SCRATCH_MNT/foobar
 	_scratch_unmount
 }
 
 create_seed
 create_sprout
+delete_seed
 
 _scratch_dev_pool_put
 
diff --git a/tests/btrfs/161.out b/tests/btrfs/161.out
index 363b8217f45c..0fe9c128dcde 100644
--- a/tests/btrfs/161.out
+++ b/tests/btrfs/161.out
@@ -7,3 +7,7 @@ QA output created by 161
 0000000 abab abab abab abab abab abab abab abab
 *
 1000000
+-- seed removed --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
-- 
2.25.1

Re: [PATCH] fstests: btrfs/161: extend the test case to delete seed

[Josef Bacik]

On 9/3/20 7:35 AM, Anand Jain wrote:
> This test case btrfs/161 does the sprout tests, so after sprout
> this patch deletes the seed to verify.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>

I'm opposed to changing tests that are currently passing to making them start 
failing if you don't have the fix.  This makes the tester go try to figure out 
wtf a test that was passing before is now suddenly failing.  Instead add a new 
test to test the new functionality, so it's clear to the tester that we're 
testing something new.  Thanks,

Josef

[PATCH] btrfs: add a test case for btrfs seed device delete

[Anand Jain]

This is a regression test for the issue fixed by the kernel patch
   btrfs: initialize sysfs devid and device link for seed device

In this test case, we verify the seed device delete on a sprouted
filesystem.

This patch also adds a filter to filter the scratch pool devices
without the device path.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 common/filter       | 13 +++++++
 tests/btrfs/219     | 94 +++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/219.out | 39 +++++++++++++++++++
 tests/btrfs/group   |  1 +
 4 files changed, 147 insertions(+)
 create mode 100755 tests/btrfs/219
 create mode 100644 tests/btrfs/219.out

diff --git a/common/filter b/common/filter
index 2477f3860151..7c5f288692e7 100644
--- a/common/filter
+++ b/common/filter
@@ -304,6 +304,19 @@ _filter_testdir_and_scratch()
 	fi
 }
 
+_filter_scratch_pool_short()
+{
+	SHORT=""
+
+	for DEV in $SCRATCH_DEV_POOL
+	do
+		SHORT="$SHORT $(echo $DEV| rev | awk -F / '{print $1}' | rev)"
+	done
+
+	FILTER_STRING=$(echo $SHORT | sed -e 's/\s\+/\\\|/g')
+	sed -e "s,$FILTER_STRING,SCRATCH_DEV,g"
+}
+
 # Turn any device in the scratch pool into SCRATCH_DEV
 _filter_scratch_pool()
 {
diff --git a/tests/btrfs/219 b/tests/btrfs/219
new file mode 100755
index 000000000000..deb2857af004
--- /dev/null
+++ b/tests/btrfs/219
@@ -0,0 +1,94 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2020 Oracle. All Rights Reserved.
+#
+# FS QA Test 219
+#
+# Test for seed device-delete on a sprouted FS.
+# Requires kernel patch
+#    btrfs: initialize sysfs devid and device link for seed device
+#
+# 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
+. ./common/filter.btrfs
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_scratch_dev_pool 2
+
+_scratch_dev_pool_get 2
+
+seed=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
+sprout=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')
+
+_mkfs_dev $seed
+_mount $seed $SCRATCH_MNT
+
+$XFS_IO_PROG -f -d -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 -d -c "pwrite -S 0xcd 0 1M" $SCRATCH_MNT/bar > /dev/null
+
+echo --- before delete ----
+UUID=$($BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | head -1 | \
+							awk '{print $4}')
+find /sys/fs/btrfs/$UUID/devinfo/ | rev | awk -F /  '{print $1}' | rev
+find /sys/fs/btrfs/$UUID/devices/ | rev | awk -F /  '{print $1}' | rev | \
+						_filter_scratch_pool_short
+echo
+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 ----
+find /sys/fs/btrfs/$UUID/devinfo/ | rev | awk -F /  '{print $1}' | rev
+find /sys/fs/btrfs/$UUID/devices/ | rev | awk -F /  '{print $1}' | rev | \
+						_filter_scratch_pool_short
+echo
+od -x $SCRATCH_MNT/foo
+od -x $SCRATCH_MNT/bar
+
+_scratch_dev_pool_put
+
+# success, all done
+status=0
+exit
diff --git a/tests/btrfs/219.out b/tests/btrfs/219.out
new file mode 100644
index 000000000000..6b054ccce95d
--- /dev/null
+++ b/tests/btrfs/219.out
@@ -0,0 +1,39 @@
+QA output created by 219
+--- before delete ----
+
+1
+in_fs_metadata
+replace_target
+writeable
+missing
+2
+in_fs_metadata
+replace_target
+writeable
+missing
+
+SCRATCH_DEV
+SCRATCH_DEV
+
+0000000 abab abab abab abab abab abab abab abab
+*
+4000000
+0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd
+*
+4000000
+--- after delete ----
+
+2
+in_fs_metadata
+replace_target
+writeable
+missing
+
+SCRATCH_DEV
+
+0000000 abab abab abab abab abab abab abab abab
+*
+4000000
+0000000 cdcd cdcd cdcd cdcd cdcd cdcd cdcd cdcd
+*
+4000000
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 3295856d0c8c..3633fa66abe4 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -221,3 +221,4 @@
 216 auto quick seed
 217 auto quick trim dangerous
 218 auto quick volume
+219 auto quick volume seed
-- 
2.25.1