[PATCH] xfstests: wipefs new device in btrfs/003

[PATCH] xfstests: wipefs new device in btrfs/003

[Josef Bacik]

We changed btrfs device add to check and see if there is an existing fs on the
device we are adding, so you now have to do -f if you want to do this.  In order
to get around checking to see if we have this version of btrfs-progs just wipefs
the device we're adding to make sure the device add will pass no matter which
version of btrfs-progs you have.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---
 common/config   | 1 +
 tests/btrfs/003 | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/common/config b/common/config
index 20c5b09..5dd7c7d 100644
--- a/common/config
+++ b/common/config
@@ -180,6 +180,7 @@ export E4DEFRAG_PROG="`set_prog_path e4defrag`"
 export LOGGER_PROG="`set_prog_path logger`"
 export DBENCH_PROG="`set_prog_path dbench`"
 export DMSETUP_PROG="`set_prog_path dmsetup`"
+export WIPEFS_PROG="`set_prog_path wipefs`"
 
 # Generate a comparable xfsprogs version number in the form of
 # major * 10000 + minor * 100 + release
diff --git a/tests/btrfs/003 b/tests/btrfs/003
index 15c2cc7..9105d06 100755
--- a/tests/btrfs/003
+++ b/tests/btrfs/003
@@ -51,6 +51,7 @@ _supported_os Linux
 _require_scratch
 _require_scratch_dev_pool
 _require_deletable_scratch_dev_pool
+_require_command $WIPEFS_PROG
 
 rm -f $seqres.full
 
@@ -109,6 +110,8 @@ _test_add()
 	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
 	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
 	for i in `seq 2 $n`; do
+		$WIPEFS_PROG -a ${devs[$i]} >> $seqres.full 2>&1 || \
+			_fail "wipefs failed"
 		$BTRFS_UTIL_PROG device add ${devs[$i]} $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "device add failed"
 	done
 	$BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "balance failed"
@@ -150,6 +153,7 @@ _test_replace()
 
 	# add a new disk to btrfs
 	ds=${devs[@]:$(($n)):1}
+	$WIPEFS_PROG -a ${ds} >> $seqres.full 2>&1 || _fail "wipefs failed"
 	$BTRFS_UTIL_PROG device add ${ds} $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "dev add failed"
 	# in some system balance fails if there is no delay (a bug)
 	# putting sleep 10 to work around as of now
-- 
1.8.3.1

Re: [PATCH] xfstests: wipefs new device in btrfs/003

[Eric Sandeen]

On 10/21/13 10:53 AM, Josef Bacik wrote:
> We changed btrfs device add to check and see if there is an existing fs on the
> device we are adding, so you now have to do -f if you want to do this.  In order
> to get around checking to see if we have this version of btrfs-progs just wipefs
> the device we're adding to make sure the device add will pass no matter which
> version of btrfs-progs you have.  Thanks,
> 
> Signed-off-by: Josef Bacik <jbacik@fusionio.com>

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  common/config   | 1 +
>  tests/btrfs/003 | 4 ++++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/common/config b/common/config
> index 20c5b09..5dd7c7d 100644
> --- a/common/config
> +++ b/common/config
> @@ -180,6 +180,7 @@ export E4DEFRAG_PROG="`set_prog_path e4defrag`"
>  export LOGGER_PROG="`set_prog_path logger`"
>  export DBENCH_PROG="`set_prog_path dbench`"
>  export DMSETUP_PROG="`set_prog_path dmsetup`"
> +export WIPEFS_PROG="`set_prog_path wipefs`"
>  
>  # Generate a comparable xfsprogs version number in the form of
>  # major * 10000 + minor * 100 + release
> diff --git a/tests/btrfs/003 b/tests/btrfs/003
> index 15c2cc7..9105d06 100755
> --- a/tests/btrfs/003
> +++ b/tests/btrfs/003
> @@ -51,6 +51,7 @@ _supported_os Linux
>  _require_scratch
>  _require_scratch_dev_pool
>  _require_deletable_scratch_dev_pool
> +_require_command $WIPEFS_PROG
>  
>  rm -f $seqres.full
>  
> @@ -109,6 +110,8 @@ _test_add()
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
>  	for i in `seq 2 $n`; do
> +		$WIPEFS_PROG -a ${devs[$i]} >> $seqres.full 2>&1 || \
> +			_fail "wipefs failed"
>  		$BTRFS_UTIL_PROG device add ${devs[$i]} $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "device add failed"
>  	done
>  	$BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "balance failed"
> @@ -150,6 +153,7 @@ _test_replace()
>  
>  	# add a new disk to btrfs
>  	ds=${devs[@]:$(($n)):1}
> +	$WIPEFS_PROG -a ${ds} >> $seqres.full 2>&1 || _fail "wipefs failed"
>  	$BTRFS_UTIL_PROG device add ${ds} $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "dev add failed"
>  	# in some system balance fails if there is no delay (a bug)
>  	# putting sleep 10 to work around as of now
> 

Re: [PATCH] xfstests: wipefs new device in btrfs/003

[Rich Johnston]

This has been committed.

Thanks
--Rich

commit 4896f63ef5dddcfe9759cbd369b5fd35084ac193
Author: Josef Bacik <jbacik@fusionio.com>
Date:   Mon Oct 21 15:53:16 2013 +0000

     xfstests: wipefs new device in btrfs/003