All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Sandeen <sandeen@sandeen.net>
To: Josef Bacik <jbacik@fusionio.com>
Cc: linux-btrfs@vger.kernel.org, xfs@oss.sgi.com
Subject: Re: [PATCH] xfstests: wipefs new device in btrfs/003
Date: Mon, 21 Oct 2013 15:00:05 -0500	[thread overview]
Message-ID: <526587C5.80404@sandeen.net> (raw)
In-Reply-To: <1382370796-12391-1-git-send-email-jbacik@fusionio.com>

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
> 


WARNING: multiple messages have this Message-ID (diff)
From: Eric Sandeen <sandeen@sandeen.net>
To: Josef Bacik <jbacik@fusionio.com>
Cc: linux-btrfs@vger.kernel.org, xfs@oss.sgi.com
Subject: Re: [PATCH] xfstests: wipefs new device in btrfs/003
Date: Mon, 21 Oct 2013 15:00:05 -0500	[thread overview]
Message-ID: <526587C5.80404@sandeen.net> (raw)
In-Reply-To: <1382370796-12391-1-git-send-email-jbacik@fusionio.com>

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
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2013-10-21 20:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-21 15:53 [PATCH] xfstests: wipefs new device in btrfs/003 Josef Bacik
2013-10-21 15:53 ` Josef Bacik
2013-10-21 20:00 ` Eric Sandeen [this message]
2013-10-21 20:00   ` Eric Sandeen
2013-10-22 21:17 ` Rich Johnston
2013-10-22 21:17   ` Rich Johnston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=526587C5.80404@sandeen.net \
    --to=sandeen@sandeen.net \
    --cc=jbacik@fusionio.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.