[PATCH v3 0/4] fstests: btrfs seed test cases

[PATCH v3 0/4] fstests: btrfs seed test cases

[Anand Jain]

1/4 was sent separately which is now integrated into this set, with some
 changes as indicated in the patch.
Though rest of the patches 2/4..4/4 are new, they carry the set version v2.

These test cases verify the seed sprout opertions.

Anand Jain (4):
  fstests: btrfs: add seed sprout functionality test
  fstests: btrfs: nested seed device test
  fstests: btrfs: seed device replace test
  fstests: btrfs: seed device delete test

 common/config       |   1 +
 tests/btrfs/161     |  90 +++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/161.out |   9 +++++
 tests/btrfs/162     | 103 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/162.out |   9 +++++
 tests/btrfs/163     | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/163.out |   9 +++++
 tests/btrfs/164     | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/164.out |   9 +++++
 tests/btrfs/group   |   4 ++
 10 files changed, 462 insertions(+)
 create mode 100755 tests/btrfs/161
 create mode 100644 tests/btrfs/161.out
 create mode 100755 tests/btrfs/162
 create mode 100644 tests/btrfs/162.out
 create mode 100755 tests/btrfs/163
 create mode 100644 tests/btrfs/163.out
 create mode 100755 tests/btrfs/164
 create mode 100644 tests/btrfs/164.out

-- 
2.7.0

[PATCH v2 1/4] fstests: btrfs: add seed sprout functionality test

[Anand Jain]

Create a seed device and add the sprout device to it.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v1->v2: Use functions to do the respective operations. Add data
verification.

 common/config       |  1 +
 tests/btrfs/161     | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/161.out |  9 ++++++
 tests/btrfs/group   |  1 +
 4 files changed, 101 insertions(+)
 create mode 100755 tests/btrfs/161
 create mode 100644 tests/btrfs/161.out

diff --git a/common/config b/common/config
index af360cefc804..f0735cb0153d 100644
--- a/common/config
+++ b/common/config
@@ -235,6 +235,7 @@ case "$HOSTOS" in
         export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
         export BTRFS_SHOW_SUPER_PROG="`set_prog_path btrfs-show-super`"
 	export BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`"
+	export BTRFS_TUNE_PROG="`set_prog_path btrfstune`"
         export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
         export MKFS_NFS_PROG="false"
         export MKFS_CIFS_PROG="false"
diff --git a/tests/btrfs/161 b/tests/btrfs/161
new file mode 100755
index 000000000000..009e95354e85
--- /dev/null
+++ b/tests/btrfs/161
@@ -0,0 +1,90 @@
+#! /bin/bash
+# FS QA Test 161 seed sprout functionality test
+#
+#  Create a seed device, mount it and, add a new device to create a
+#  sprout filesystem.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+# Author: Anand Jain <anand.jain@oracle.com>
+#
+# 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.*
+}
+
+# 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
+_supported_os Linux
+_require_scratch_dev_pool 2
+
+_scratch_dev_pool_get 2
+
+DEV_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
+DEV_SPROUT=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')
+
+create_seed()
+{
+	_mkfs_dev $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	$XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 256K" $SCRATCH_MNT/foobar >\
+		/dev/null
+	echo -- golden --
+	od -x $SCRATCH_MNT/foobar
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+	$BTRFS_TUNE_PROG -S 1 $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+}
+
+create_sprout()
+{
+	_run_btrfs_util_prog device add -f $DEV_SPROUT $SCRATCH_MNT
+	_scratch_unmount
+	run_check _mount $DEV_SPROUT $SCRATCH_MNT
+	echo -- sprout --
+	od -x $SCRATCH_MNT/foobar
+	_scratch_unmount
+}
+
+create_seed
+create_sprout
+
+_scratch_dev_pool_put
+
+status=0
+exit
diff --git a/tests/btrfs/161.out b/tests/btrfs/161.out
new file mode 100644
index 000000000000..363b8217f45c
--- /dev/null
+++ b/tests/btrfs/161.out
@@ -0,0 +1,9 @@
+QA output created by 161
+-- golden --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
+-- sprout --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
diff --git a/tests/btrfs/group b/tests/btrfs/group
index f04ee8d5297c..fe83631f0f33 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -163,3 +163,4 @@
 158 auto quick raid scrub
 159 auto quick
 160 auto quick
+161 auto quick
-- 
2.7.0

[PATCH v2 2/4] fstests: btrfs: nested seed device test

[Anand Jain]

Test case to verify that a sprout device can be a seed device

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/162     | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/162.out |   9 +++++
 tests/btrfs/group   |   1 +
 3 files changed, 113 insertions(+)
 create mode 100755 tests/btrfs/162
 create mode 100644 tests/btrfs/162.out

diff --git a/tests/btrfs/162 b/tests/btrfs/162
new file mode 100755
index 000000000000..fe63fb3ad704
--- /dev/null
+++ b/tests/btrfs/162
@@ -0,0 +1,103 @@
+#! /bin/bash
+# FS QA Test 162 nested seed device test
+#
+# Steps:
+# Create a seed device
+# Create a sprout device
+# Make the sprout device a seed device and create a sprout device again
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+# Author: Anand Jain <anand.jain@oracle.com>
+#
+# 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.*
+}
+
+# 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 btrfs
+_supported_os Linux
+_require_scratch_dev_pool 3
+
+_scratch_dev_pool_get 3
+
+DEV_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
+DEV_SPROUT_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')
+DEV_SPROUT=$(echo $SCRATCH_DEV_POOL | awk '{print $3}')
+
+create_seed()
+{
+	_mkfs_dev $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	$XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 256K" $SCRATCH_MNT/foobar >\
+		/dev/null
+	echo -- gloden --
+	od -x $SCRATCH_MNT/foobar
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+	$BTRFS_TUNE_PROG -S 1 $DEV_SEED
+}
+
+create_sprout_seed()
+{
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	_run_btrfs_util_prog device add -f $DEV_SPROUT_SEED $SCRATCH_MNT
+	_scratch_unmount
+	$BTRFS_TUNE_PROG -S 1 $DEV_SPROUT_SEED
+}
+
+create_next_sprout()
+{
+	run_check _mount -o device=$DEV_SEED $DEV_SPROUT_SEED $SCRATCH_MNT
+	_run_btrfs_util_prog device add -f $DEV_SPROUT $SCRATCH_MNT
+	_scratch_unmount
+	run_check _mount -o device=$DEV_SEED,device=$DEV_SPROUT_SEED \
+		$DEV_SPROUT $SCRATCH_MNT
+	echo -- sprout --
+	od -x $SCRATCH_MNT/foobar
+}
+
+create_seed
+create_sprout_seed
+create_next_sprout
+
+_scratch_dev_pool_put
+
+status=0
+exit
diff --git a/tests/btrfs/162.out b/tests/btrfs/162.out
new file mode 100644
index 000000000000..ada7cc5507bd
--- /dev/null
+++ b/tests/btrfs/162.out
@@ -0,0 +1,9 @@
+QA output created by 162
+-- gloden --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
+-- sprout --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
diff --git a/tests/btrfs/group b/tests/btrfs/group
index fe83631f0f33..cdc8ad32036e 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -164,3 +164,4 @@
 159 auto quick
 160 auto quick
 161 auto quick
+162 auto quick
-- 
2.7.0

[PATCH v2 3/4] fstests: btrfs: seed device replace test

[Anand Jain]

Test case to verify that a seed device can be replaced

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/163     | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/163.out |   9 +++++
 tests/btrfs/group   |   1 +
 3 files changed, 124 insertions(+)
 create mode 100755 tests/btrfs/163
 create mode 100644 tests/btrfs/163.out

diff --git a/tests/btrfs/163 b/tests/btrfs/163
new file mode 100755
index 000000000000..e59f1deae42e
--- /dev/null
+++ b/tests/btrfs/163
@@ -0,0 +1,114 @@
+#! /bin/bash
+# FS QA Test 163 seed device replace test
+#
+# Test case to verify that a seed device can be replaced
+#
+# Steps:
+#  Create a seed device
+#  Create a sprout device
+#  Remount RW
+#  Run device replace on the seed device
+#-----------------------------------------------------------------------
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+# Author: Anand Jain <anand.jain@oracle.com>
+#
+# 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.*
+}
+
+# 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 btrfs
+_supported_os Linux
+_require_scratch_dev_pool 3
+
+_scratch_dev_pool_get 3
+
+DEV_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
+DEV_SPROUT=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')
+DEV_REPLACE_TGT=$(echo $SCRATCH_DEV_POOL | awk '{print $3}')
+
+create_seed()
+{
+	_mkfs_dev $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	$XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 256K" $SCRATCH_MNT/foobar >\
+		/dev/null
+	echo -- gloden --
+	od -x $SCRATCH_MNT/foobar
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+	$BTRFS_TUNE_PROG -S 1 $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+}
+
+add_sprout()
+{
+	_run_btrfs_util_prog device add -f $DEV_SPROUT $SCRATCH_MNT
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+}
+
+replace_seed()
+{
+	_run_btrfs_util_prog replace start -fB $DEV_SEED $DEV_REPLACE_TGT $SCRATCH_MNT
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+	run_check _mount $DEV_REPLACE_TGT $SCRATCH_MNT
+	echo -- sprout --
+	od -x $SCRATCH_MNT/foobar
+	_scratch_unmount
+
+}
+
+seed_is_mountable()
+{
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+}
+
+create_seed
+add_sprout
+replace_seed
+
+seed_is_mountable
+
+_scratch_dev_pool_put
+
+status=0
+exit
diff --git a/tests/btrfs/163.out b/tests/btrfs/163.out
new file mode 100644
index 000000000000..50f46da6df86
--- /dev/null
+++ b/tests/btrfs/163.out
@@ -0,0 +1,9 @@
+QA output created by 163
+-- gloden --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
+-- sprout --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
diff --git a/tests/btrfs/group b/tests/btrfs/group
index cdc8ad32036e..2b7b0caf407e 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -165,3 +165,4 @@
 160 auto quick
 161 auto quick
 162 auto quick
+163 auto quick
-- 
2.7.0

[PATCH v2 4/4] fstests: btrfs: seed device delete test

[Anand Jain]

Test case to verify that a seed device can be deleted

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/164     | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/164.out |   9 +++++
 tests/btrfs/group   |   1 +
 3 files changed, 124 insertions(+)
 create mode 100755 tests/btrfs/164
 create mode 100644 tests/btrfs/164.out

diff --git a/tests/btrfs/164 b/tests/btrfs/164
new file mode 100755
index 000000000000..31f7f1f72d5e
--- /dev/null
+++ b/tests/btrfs/164
@@ -0,0 +1,114 @@
+#! /bin/bash
+# FS QA Test 164 seed device delete test
+#
+# Test case to verify that a seed device can be deleted
+#
+# Steps:
+# Create a seed device
+# Create a sprout device
+# Remount RW
+# Run device delete on the seed device
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+# Author: Anand Jain <anand.jain@oracle.com>
+#
+# 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.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/module
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+_require_loadable_fs_module "btrfs"
+_require_scratch_dev_pool 2
+_scratch_dev_pool_get 2
+
+DEV_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
+DEV_SPROUT=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')
+
+create_seed()
+{
+	_mkfs_dev $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	$XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 256K" $SCRATCH_MNT/foobar >\
+		/dev/null
+	echo -- gloden --
+	od -x $SCRATCH_MNT/foobar
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+	$BTRFS_TUNE_PROG -S 1 $DEV_SEED
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+}
+
+add_sprout()
+{
+	_run_btrfs_util_prog device add -f $DEV_SPROUT $SCRATCH_MNT
+	run_check mount -o rw,remount $DEV_SEED $SCRATCH_MNT
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+}
+
+delete_seed()
+{
+	_run_btrfs_util_prog device delete $DEV_SEED $SCRATCH_MNT
+	_scratch_unmount
+	_reload_fs_module "btrfs"
+	run_check _mount $DEV_SPROUT $SCRATCH_MNT
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	echo -- sprout --
+	od -x $SCRATCH_MNT/foobar
+	_scratch_unmount
+}
+
+seed_is_mountable()
+{
+	run_check _mount $DEV_SEED $SCRATCH_MNT
+	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
+	_scratch_unmount
+}
+
+create_seed
+add_sprout
+delete_seed
+
+seed_is_mountable
+
+_scratch_dev_pool_put
+
+status=0
+exit
diff --git a/tests/btrfs/164.out b/tests/btrfs/164.out
new file mode 100644
index 000000000000..c073b7a88ae1
--- /dev/null
+++ b/tests/btrfs/164.out
@@ -0,0 +1,9 @@
+QA output created by 164
+-- gloden --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
+-- sprout --
+0000000 abab abab abab abab abab abab abab abab
+*
+1000000
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 2b7b0caf407e..d3639ba8dbfe 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -166,3 +166,4 @@
 161 auto quick
 162 auto quick
 163 auto quick
+164 auto quick
-- 
2.7.0

Re: [PATCH v2 1/4] fstests: btrfs: add seed sprout functionality test

[Eryu Guan]

On Mon, May 28, 2018 at 05:51:45PM +0800, Anand Jain wrote:
> Create a seed device and add the sprout device to it.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>

This series looks fine to me from fstests' point of view, there're just
some really minor common issues.

But I'd like some reviews from other btrfs folks.

> ---
> v1->v2: Use functions to do the respective operations. Add data
> verification.
> 
>  common/config       |  1 +
>  tests/btrfs/161     | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/btrfs/161.out |  9 ++++++
>  tests/btrfs/group   |  1 +
>  4 files changed, 101 insertions(+)
>  create mode 100755 tests/btrfs/161
>  create mode 100644 tests/btrfs/161.out
> 
> diff --git a/common/config b/common/config
> index af360cefc804..f0735cb0153d 100644
> --- a/common/config
> +++ b/common/config
> @@ -235,6 +235,7 @@ case "$HOSTOS" in
>          export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
>          export BTRFS_SHOW_SUPER_PROG="`set_prog_path btrfs-show-super`"
>  	export BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`"
> +	export BTRFS_TUNE_PROG="`set_prog_path btrfstune`"
>          export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
>          export MKFS_NFS_PROG="false"
>          export MKFS_CIFS_PROG="false"
> diff --git a/tests/btrfs/161 b/tests/btrfs/161
> new file mode 100755
> index 000000000000..009e95354e85
> --- /dev/null
> +++ b/tests/btrfs/161
> @@ -0,0 +1,90 @@
> +#! /bin/bash
> +# FS QA Test 161 seed sprout functionality test

It'd be good to put the all test descriptions below the test seq number,
as all other tests do.

> +#
> +#  Create a seed device, mount it and, add a new device to create a
> +#  sprout filesystem.
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2018 Oracle.  All Rights Reserved.
> +# Author: Anand Jain <anand.jain@oracle.com>

The author info is not needed.

> +#
> +# 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.*
> +}
> +
> +# 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
> +_supported_os Linux
> +_require_scratch_dev_pool 2

_require_command "$BTRFS_TUNE_PROG" btrfstune

> +
> +_scratch_dev_pool_get 2
> +
> +DEV_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
> +DEV_SPROUT=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')

Better to use lower case for local variables.

Thanks,
Eryu

> +
> +create_seed()
> +{
> +	_mkfs_dev $DEV_SEED
> +	run_check _mount $DEV_SEED $SCRATCH_MNT
> +	$XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 256K" $SCRATCH_MNT/foobar >\
> +		/dev/null
> +	echo -- golden --
> +	od -x $SCRATCH_MNT/foobar
> +	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
> +	_scratch_unmount
> +	$BTRFS_TUNE_PROG -S 1 $DEV_SEED
> +	run_check _mount $DEV_SEED $SCRATCH_MNT
> +}
> +
> +create_sprout()
> +{
> +	_run_btrfs_util_prog device add -f $DEV_SPROUT $SCRATCH_MNT
> +	_scratch_unmount
> +	run_check _mount $DEV_SPROUT $SCRATCH_MNT
> +	echo -- sprout --
> +	od -x $SCRATCH_MNT/foobar
> +	_scratch_unmount
> +}
> +
> +create_seed
> +create_sprout
> +
> +_scratch_dev_pool_put
> +
> +status=0
> +exit
> diff --git a/tests/btrfs/161.out b/tests/btrfs/161.out
> new file mode 100644
> index 000000000000..363b8217f45c
> --- /dev/null
> +++ b/tests/btrfs/161.out
> @@ -0,0 +1,9 @@
> +QA output created by 161
> +-- golden --
> +0000000 abab abab abab abab abab abab abab abab
> +*
> +1000000
> +-- sprout --
> +0000000 abab abab abab abab abab abab abab abab
> +*
> +1000000
> diff --git a/tests/btrfs/group b/tests/btrfs/group
> index f04ee8d5297c..fe83631f0f33 100644
> --- a/tests/btrfs/group
> +++ b/tests/btrfs/group
> @@ -163,3 +163,4 @@
>  158 auto quick raid scrub
>  159 auto quick
>  160 auto quick
> +161 auto quick
> -- 
> 2.7.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/4] fstests: btrfs: add seed sprout functionality test

[Anand Jain]

On 05/29/2018 09:48 PM, Eryu Guan wrote:
> On Mon, May 28, 2018 at 05:51:45PM +0800, Anand Jain wrote:
>> Create a seed device and add the sprout device to it.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> 
> This series looks fine to me from fstests' point of view, there're just
> some really minor common issues.
> 
> But I'd like some reviews from other btrfs folks.
> 
>> ---
>> v1->v2: Use functions to do the respective operations. Add data
>> verification.
>>
>>   common/config       |  1 +
>>   tests/btrfs/161     | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>>   tests/btrfs/161.out |  9 ++++++
>>   tests/btrfs/group   |  1 +
>>   4 files changed, 101 insertions(+)
>>   create mode 100755 tests/btrfs/161
>>   create mode 100644 tests/btrfs/161.out
>>
>> diff --git a/common/config b/common/config
>> index af360cefc804..f0735cb0153d 100644
>> --- a/common/config
>> +++ b/common/config
>> @@ -235,6 +235,7 @@ case "$HOSTOS" in
>>           export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
>>           export BTRFS_SHOW_SUPER_PROG="`set_prog_path btrfs-show-super`"
>>   	export BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`"
>> +	export BTRFS_TUNE_PROG="`set_prog_path btrfstune`"
>>           export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
>>           export MKFS_NFS_PROG="false"
>>           export MKFS_CIFS_PROG="false"
>> diff --git a/tests/btrfs/161 b/tests/btrfs/161
>> new file mode 100755
>> index 000000000000..009e95354e85
>> --- /dev/null
>> +++ b/tests/btrfs/161
>> @@ -0,0 +1,90 @@
>> +#! /bin/bash
>> +# FS QA Test 161 seed sprout functionality test
> 
> It'd be good to put the all test descriptions below the test seq number,
> as all other tests do.

  Ok.

>> +#
>> +#  Create a seed device, mount it and, add a new device to create a
>> +#  sprout filesystem.
>> +#
>> +#-----------------------------------------------------------------------
>> +# Copyright (c) 2018 Oracle.  All Rights Reserved.
>> +# Author: Anand Jain <anand.jain@oracle.com>
> 
> The author info is not needed.

ok.

>> +#
>> +# 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.*
>> +}
>> +
>> +# 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
>> +_supported_os Linux
>> +_require_scratch_dev_pool 2
> 
> _require_command "$BTRFS_TUNE_PROG" btrfstune

  yep added in v3.

>> +
>> +_scratch_dev_pool_get 2
>> +
>> +DEV_SEED=$(echo $SCRATCH_DEV_POOL | awk '{print $1}')
>> +DEV_SPROUT=$(echo $SCRATCH_DEV_POOL | awk '{print $2}')
> 
> Better to use lower case for local variables.

  ok.

Please find v3 with the above changed.
Thanks, Anand

> Thanks,
> Eryu
> 
>> +
>> +create_seed()
>> +{
>> +	_mkfs_dev $DEV_SEED
>> +	run_check _mount $DEV_SEED $SCRATCH_MNT
>> +	$XFS_IO_PROG -f -d -c "pwrite -S 0xab 0 256K" $SCRATCH_MNT/foobar >\
>> +		/dev/null
>> +	echo -- golden --
>> +	od -x $SCRATCH_MNT/foobar
>> +	_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
>> +	_scratch_unmount
>> +	$BTRFS_TUNE_PROG -S 1 $DEV_SEED
>> +	run_check _mount $DEV_SEED $SCRATCH_MNT
>> +}
>> +
>> +create_sprout()
>> +{
>> +	_run_btrfs_util_prog device add -f $DEV_SPROUT $SCRATCH_MNT
>> +	_scratch_unmount
>> +	run_check _mount $DEV_SPROUT $SCRATCH_MNT
>> +	echo -- sprout --
>> +	od -x $SCRATCH_MNT/foobar
>> +	_scratch_unmount
>> +}
>> +
>> +create_seed
>> +create_sprout
>> +
>> +_scratch_dev_pool_put
>> +
>> +status=0
>> +exit
>> diff --git a/tests/btrfs/161.out b/tests/btrfs/161.out
>> new file mode 100644
>> index 000000000000..363b8217f45c
>> --- /dev/null
>> +++ b/tests/btrfs/161.out
>> @@ -0,0 +1,9 @@
>> +QA output created by 161
>> +-- golden --
>> +0000000 abab abab abab abab abab abab abab abab
>> +*
>> +1000000
>> +-- sprout --
>> +0000000 abab abab abab abab abab abab abab abab
>> +*
>> +1000000
>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>> index f04ee8d5297c..fe83631f0f33 100644
>> --- a/tests/btrfs/group
>> +++ b/tests/btrfs/group
>> @@ -163,3 +163,4 @@
>>   158 auto quick raid scrub
>>   159 auto quick
>>   160 auto quick
>> +161 auto quick
>> -- 
>> 2.7.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe fstests" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html