[ANNOUNCE] xfstests: updated to cf1ed54

[ANNOUNCE] xfstests: updated to cf1ed54

[Dave Chinner]

Hi folks,

The xfstests repository at git://oss.sgi.com/xfs/cmds/xfstests has
just been updated. Patches often get missed, so please check if your
outstanding patches were in this update. If they have not been in
this update, please resubmit them to xfs@oss.sgi.com so they can be
picked up in the next update.

The new head of the master branch is commit:

cf1ed54 check: fix RESULT_BASE typo in check script

The major new functionality worth mentioning in this update is the
new config file format from Lukas. The existing format config files
should continue to work without change, but the new format is much
richer and allows specification of multiple different configurations
to run test under. Hence testing multiple mount an dmkfs
configurations becomes as simple as iterating the configurations
in the config file.

New Commits:

Christoph Hellwig (2):
      [feb7da1] common: add flink support to _require_xfs_io_command
      [3bbbc25] generic: add a basic O_TMPFILE test

Eric Sandeen (1):
      [cf1ed54] check: fix RESULT_BASE typo in check script

Eryu Guan (1):
      [dadfd3c] shared: new test to use up free inodes

Filipe David Borba Manana (3):
      [bb2499e] btrfs: add test for btrfs send issuing premature rmdir operations
      [c99c847] btrfs: add test for btrfs incremental send
      [e0ff31a] btrfs: add test for btrfs incremental send data corruption

Filipe Manana (1):
      [1a87439] btrfs: add test for btrfs send directory moves/renames

Hannes Frederic Sowa (1):
      [947ee8b] fs: add directories hash collision test

Lukas Czerner (10):
      [4d18f5a] generic: add generic test for fallocate zero range
      [bf44459] check: Prepare for config section
      [667308d] check: Add support for sections in config file
      [f8e4f53] check: Allow to recreate TEST_DEV
      [b1ffb05] check: Remount file system if MOUNT_OPTIONS changed
      [7baa3e2] check: unmount TEST_DEV and SCRATCH_DEV after test run
      [21723cd] generic: Make some shared tests generic
      [259d680] ext4: Make shared/243 ext4 specific
      [5f8c711] fsx: Add fallocate collapse range operation
      [f98d930] fsstress: Add fallocate collapse range operation


Code Diffstat:

 .gitignore                                |   1 +
 README.config-sections                    |  87 +++++++
 check                                     | 404 ++++++++++++++++++------------
 common/config                             | 155 +++++++++++-
 common/rc                                 |  30 ++-
 ltp/fsstress.c                            |  20 ++
 ltp/fsx.c                                 | 107 +++++++-
 src/Makefile                              |   2 +-
 src/dirhash_collide.c                     | 223 +++++++++++++++++
 tests/btrfs/043                           | 149 +++++++++++
 tests/btrfs/043.out                       |   1 +
 tests/btrfs/044                           | 129 ++++++++++
 tests/btrfs/044.out                       |   1 +
 tests/btrfs/045                           | 376 +++++++++++++++++++++++++++
 tests/btrfs/045.out                       |   1 +
 tests/btrfs/046                           | 304 ++++++++++++++++++++++
 tests/btrfs/046.out                       | 213 ++++++++++++++++
 tests/btrfs/group                         |   4 +
 tests/{shared/243 => ext4/002}            |   4 +-
 tests/{shared/243.out => ext4/002.out}    |   2 +-
 tests/ext4/group                          |   1 +
 tests/generic/004                         |  65 +++++
 tests/generic/004.out                     |   6 +
 tests/generic/009                         |  78 ++++++
 tests/generic/009.out                     | 333 ++++++++++++++++++++++++
 tests/{shared/003 => generic/012}         |   6 +-
 tests/{shared/003.out => generic/012.out} |   2 +-
 tests/{shared/004 => generic/016}         |   6 +-
 tests/{shared/004.out => generic/016.out} |   2 +-
 tests/{shared/005 => generic/017}         |   4 +-
 tests/generic/017.out                     |   4 +
 tests/{shared/218 => generic/018}         |   4 +-
 tests/{shared/218.out => generic/018.out} |   2 +-
 tests/{shared/305 => generic/019}         |   4 +-
 tests/{shared/305.out => generic/019.out} |   2 +-
 tests/{shared/001 => generic/021}         |   6 +-
 tests/{shared/001.out => generic/021.out} |   2 +-
 tests/{shared/002 => generic/022}         |   6 +-
 tests/{shared/002.out => generic/022.out} |   2 +-
 tests/generic/group                       |   9 +
 tests/shared/005.out                      |   4 -
 tests/shared/006                          |  97 +++++++
 tests/shared/006.out                      |   2 +
 tests/shared/group                        |  10 +-
 tests/xfs/006                             |  63 +++++
 tests/xfs/006.out                         |  28 +++
 tests/xfs/group                           |   1 +
 47 files changed, 2746 insertions(+), 216 deletions(-)
 create mode 100644 README.config-sections
 create mode 100644 src/dirhash_collide.c
 create mode 100644 tests/btrfs/043
 create mode 100644 tests/btrfs/043.out
 create mode 100644 tests/btrfs/044
 create mode 100644 tests/btrfs/044.out
 create mode 100755 tests/btrfs/045
 create mode 100644 tests/btrfs/045.out
 create mode 100644 tests/btrfs/046
 create mode 100644 tests/btrfs/046.out
 rename tests/{shared/243 => ext4/002} (99%)
 rename tests/{shared/243.out => ext4/002.out} (95%)
 create mode 100755 tests/generic/004
 create mode 100644 tests/generic/004.out
 create mode 100644 tests/generic/009
 create mode 100644 tests/generic/009.out
 rename tests/{shared/003 => generic/012} (93%)
 mode change 100644 => 100755
 rename tests/{shared/003.out => generic/012.out} (97%)
 rename tests/{shared/004 => generic/016} (93%)
 mode change 100644 => 100755
 rename tests/{shared/004.out => generic/016.out} (97%)
 rename tests/{shared/005 => generic/017} (97%)
 mode change 100644 => 100755
 create mode 100644 tests/generic/017.out
 rename tests/{shared/218 => generic/018} (98%)
 rename tests/{shared/218.out => generic/018.out} (93%)
 rename tests/{shared/305 => generic/019} (98%)
 rename tests/{shared/305.out => generic/019.out} (88%)
 rename tests/{shared/001 => generic/021} (93%)
 rename tests/{shared/001.out => generic/021.out} (97%)
 rename tests/{shared/002 => generic/022} (93%)
 mode change 100644 => 100755
 rename tests/{shared/002.out => generic/022.out} (97%)
 delete mode 100644 tests/shared/005.out
 create mode 100755 tests/shared/006
 create mode 100644 tests/shared/006.out
 create mode 100755 tests/xfs/006
 create mode 100644 tests/xfs/006.out
-- 
Dave Chinner
david@fromorbit.com

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

Re: [ANNOUNCE] xfstests: updated to cf1ed54

[Filipe David Manana]

On Fri, Apr 4, 2014 at 10:03 AM, Dave Chinner <david@fromorbit.com> wrote:
> Hi folks,
>
> The xfstests repository at git://oss.sgi.com/xfs/cmds/xfstests has
> just been updated. Patches often get missed, so please check if your
> outstanding patches were in this update. If they have not been in
> this update, please resubmit them to xfs@oss.sgi.com so they can be
> picked up in the next update.
>
> The new head of the master branch is commit:
>
> cf1ed54 check: fix RESULT_BASE typo in check script
>
> The major new functionality worth mentioning in this update is the
> new config file format from Lukas. The existing format config files
> should continue to work without change, but the new format is much
> richer and allows specification of multiple different configurations
> to run test under. Hence testing multiple mount an dmkfs
> configurations becomes as simple as iterating the configurations
> in the config file.

Hi,

I might be missing something, but after checking out these changes, I
am no longer able to run btrfs tests. Example:

$ ./check btrfs/041
common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set
Passed all 0 tests

$ cat local.config
export TEST_DEV=/dev/sdb
export TEST_DIR=/home/fdmanana/btrfs-tests/dev
export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"

I did check too that my shell environment didn't define/export SCRATCH_DEV.
Going back to revision 3948694eb12e9699f558fab5e8169a8b090780d1, using
the same exact config, it works.

Do I need to adjust something in my config or is it a regression?

thanks


>
> New Commits:
>
> Christoph Hellwig (2):
>       [feb7da1] common: add flink support to _require_xfs_io_command
>       [3bbbc25] generic: add a basic O_TMPFILE test
>
> Eric Sandeen (1):
>       [cf1ed54] check: fix RESULT_BASE typo in check script
>
> Eryu Guan (1):
>       [dadfd3c] shared: new test to use up free inodes
>
> Filipe David Borba Manana (3):
>       [bb2499e] btrfs: add test for btrfs send issuing premature rmdir operations
>       [c99c847] btrfs: add test for btrfs incremental send
>       [e0ff31a] btrfs: add test for btrfs incremental send data corruption
>
> Filipe Manana (1):
>       [1a87439] btrfs: add test for btrfs send directory moves/renames
>
> Hannes Frederic Sowa (1):
>       [947ee8b] fs: add directories hash collision test
>
> Lukas Czerner (10):
>       [4d18f5a] generic: add generic test for fallocate zero range
>       [bf44459] check: Prepare for config section
>       [667308d] check: Add support for sections in config file
>       [f8e4f53] check: Allow to recreate TEST_DEV
>       [b1ffb05] check: Remount file system if MOUNT_OPTIONS changed
>       [7baa3e2] check: unmount TEST_DEV and SCRATCH_DEV after test run
>       [21723cd] generic: Make some shared tests generic
>       [259d680] ext4: Make shared/243 ext4 specific
>       [5f8c711] fsx: Add fallocate collapse range operation
>       [f98d930] fsstress: Add fallocate collapse range operation
>
>
> Code Diffstat:
>
>  .gitignore                                |   1 +
>  README.config-sections                    |  87 +++++++
>  check                                     | 404 ++++++++++++++++++------------
>  common/config                             | 155 +++++++++++-
>  common/rc                                 |  30 ++-
>  ltp/fsstress.c                            |  20 ++
>  ltp/fsx.c                                 | 107 +++++++-
>  src/Makefile                              |   2 +-
>  src/dirhash_collide.c                     | 223 +++++++++++++++++
>  tests/btrfs/043                           | 149 +++++++++++
>  tests/btrfs/043.out                       |   1 +
>  tests/btrfs/044                           | 129 ++++++++++
>  tests/btrfs/044.out                       |   1 +
>  tests/btrfs/045                           | 376 +++++++++++++++++++++++++++
>  tests/btrfs/045.out                       |   1 +
>  tests/btrfs/046                           | 304 ++++++++++++++++++++++
>  tests/btrfs/046.out                       | 213 ++++++++++++++++
>  tests/btrfs/group                         |   4 +
>  tests/{shared/243 => ext4/002}            |   4 +-
>  tests/{shared/243.out => ext4/002.out}    |   2 +-
>  tests/ext4/group                          |   1 +
>  tests/generic/004                         |  65 +++++
>  tests/generic/004.out                     |   6 +
>  tests/generic/009                         |  78 ++++++
>  tests/generic/009.out                     | 333 ++++++++++++++++++++++++
>  tests/{shared/003 => generic/012}         |   6 +-
>  tests/{shared/003.out => generic/012.out} |   2 +-
>  tests/{shared/004 => generic/016}         |   6 +-
>  tests/{shared/004.out => generic/016.out} |   2 +-
>  tests/{shared/005 => generic/017}         |   4 +-
>  tests/generic/017.out                     |   4 +
>  tests/{shared/218 => generic/018}         |   4 +-
>  tests/{shared/218.out => generic/018.out} |   2 +-
>  tests/{shared/305 => generic/019}         |   4 +-
>  tests/{shared/305.out => generic/019.out} |   2 +-
>  tests/{shared/001 => generic/021}         |   6 +-
>  tests/{shared/001.out => generic/021.out} |   2 +-
>  tests/{shared/002 => generic/022}         |   6 +-
>  tests/{shared/002.out => generic/022.out} |   2 +-
>  tests/generic/group                       |   9 +
>  tests/shared/005.out                      |   4 -
>  tests/shared/006                          |  97 +++++++
>  tests/shared/006.out                      |   2 +
>  tests/shared/group                        |  10 +-
>  tests/xfs/006                             |  63 +++++
>  tests/xfs/006.out                         |  28 +++
>  tests/xfs/group                           |   1 +
>  47 files changed, 2746 insertions(+), 216 deletions(-)
>  create mode 100644 README.config-sections
>  create mode 100644 src/dirhash_collide.c
>  create mode 100644 tests/btrfs/043
>  create mode 100644 tests/btrfs/043.out
>  create mode 100644 tests/btrfs/044
>  create mode 100644 tests/btrfs/044.out
>  create mode 100755 tests/btrfs/045
>  create mode 100644 tests/btrfs/045.out
>  create mode 100644 tests/btrfs/046
>  create mode 100644 tests/btrfs/046.out
>  rename tests/{shared/243 => ext4/002} (99%)
>  rename tests/{shared/243.out => ext4/002.out} (95%)
>  create mode 100755 tests/generic/004
>  create mode 100644 tests/generic/004.out
>  create mode 100644 tests/generic/009
>  create mode 100644 tests/generic/009.out
>  rename tests/{shared/003 => generic/012} (93%)
>  mode change 100644 => 100755
>  rename tests/{shared/003.out => generic/012.out} (97%)
>  rename tests/{shared/004 => generic/016} (93%)
>  mode change 100644 => 100755
>  rename tests/{shared/004.out => generic/016.out} (97%)
>  rename tests/{shared/005 => generic/017} (97%)
>  mode change 100644 => 100755
>  create mode 100644 tests/generic/017.out
>  rename tests/{shared/218 => generic/018} (98%)
>  rename tests/{shared/218.out => generic/018.out} (93%)
>  rename tests/{shared/305 => generic/019} (98%)
>  rename tests/{shared/305.out => generic/019.out} (88%)
>  rename tests/{shared/001 => generic/021} (93%)
>  rename tests/{shared/001.out => generic/021.out} (97%)
>  rename tests/{shared/002 => generic/022} (93%)
>  mode change 100644 => 100755
>  rename tests/{shared/002.out => generic/022.out} (97%)
>  delete mode 100644 tests/shared/005.out
>  create mode 100755 tests/shared/006
>  create mode 100644 tests/shared/006.out
>  create mode 100755 tests/xfs/006
>  create mode 100644 tests/xfs/006.out
> --
> Dave Chinner
> david@fromorbit.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

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

Re: [ANNOUNCE] xfstests: updated to cf1ed54

[Dave Chinner]

On Fri, Apr 04, 2014 at 02:07:16PM +0100, Filipe David Manana wrote:
> On Fri, Apr 4, 2014 at 10:03 AM, Dave Chinner <david@fromorbit.com> wrote:
> > Hi folks,
> >
> > The xfstests repository at git://oss.sgi.com/xfs/cmds/xfstests has
> > just been updated. Patches often get missed, so please check if your
> > outstanding patches were in this update. If they have not been in
> > this update, please resubmit them to xfs@oss.sgi.com so they can be
> > picked up in the next update.
> >
> > The new head of the master branch is commit:
> >
> > cf1ed54 check: fix RESULT_BASE typo in check script
> >
> > The major new functionality worth mentioning in this update is the
> > new config file format from Lukas. The existing format config files
> > should continue to work without change, but the new format is much
> > richer and allows specification of multiple different configurations
> > to run test under. Hence testing multiple mount an dmkfs
> > configurations becomes as simple as iterating the configurations
> > in the config file.
> 
> Hi,
> 
> I might be missing something, but after checking out these changes, I
> am no longer able to run btrfs tests. Example:
> 
> $ ./check btrfs/041
> common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set
> Passed all 0 tests
> 
> $ cat local.config
> export TEST_DEV=/dev/sdb
> export TEST_DIR=/home/fdmanana/btrfs-tests/dev
> export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
> export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"

OK, that'll be a bug in the new config file parsing code. Lukas,
can you have a look at this?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [ANNOUNCE] xfstests: updated to cf1ed54

[Lukáš Czerner]

On Sat, 5 Apr 2014, Dave Chinner wrote:

> Date: Sat, 5 Apr 2014 08:12:25 +1100
> From: Dave Chinner <david@fromorbit.com>
> To: Filipe David Manana <fdmanana@gmail.com>
> Cc: "xfs@oss.sgi.com" <xfs@oss.sgi.com>,
>     "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
>     linux-ext4@vger.kernel.org, lczerner@redhat.com
> Subject: Re: [ANNOUNCE] xfstests: updated to cf1ed54
> 
> On Fri, Apr 04, 2014 at 02:07:16PM +0100, Filipe David Manana wrote:
> > On Fri, Apr 4, 2014 at 10:03 AM, Dave Chinner <david@fromorbit.com> wrote:
> > > Hi folks,
> > >
> > > The xfstests repository at git://oss.sgi.com/xfs/cmds/xfstests has
> > > just been updated. Patches often get missed, so please check if your
> > > outstanding patches were in this update. If they have not been in
> > > this update, please resubmit them to xfs@oss.sgi.com so they can be
> > > picked up in the next update.
> > >
> > > The new head of the master branch is commit:
> > >
> > > cf1ed54 check: fix RESULT_BASE typo in check script
> > >
> > > The major new functionality worth mentioning in this update is the
> > > new config file format from Lukas. The existing format config files
> > > should continue to work without change, but the new format is much
> > > richer and allows specification of multiple different configurations
> > > to run test under. Hence testing multiple mount an dmkfs
> > > configurations becomes as simple as iterating the configurations
> > > in the config file.
> > 
> > Hi,
> > 
> > I might be missing something, but after checking out these changes, I
> > am no longer able to run btrfs tests. Example:
> > 
> > $ ./check btrfs/041
> > common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set
> > Passed all 0 tests
> > 
> > $ cat local.config
> > export TEST_DEV=/dev/sdb
> > export TEST_DIR=/home/fdmanana/btrfs-tests/dev
> > export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
> > export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"
> 
> OK, that'll be a bug in the new config file parsing code. Lukas,
> can you have a look at this?

Oh, yes. I'll take a look at this. Honestly I was not aware of
SCRATCH_DEV_POOL.

Thanks!
-Lukas

> 
> Cheers,
> 
> Dave.
> 

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

[PATCH 1/3] xfstests: Fix SCRATCH_DEV_POOL handling

[Lukas Czerner]

With changes introduced in 667308dd97bf41382d4ab299fa5b56c235cfeb27
it is no longer possible to use SCRATCH_DEV_POOL variable because of
error:

 common/config: Error: $SCRATCH_DEV should be unset when
 $SCRATCH_DEV_POOL is set

This was because get_next_config() would get called twice and hence it
would complain on the second run that SCRATCH_DEV is already set. Fix
it by making sure that we call get_next_config() only once if there
are no sections in the config file.

Also make sure that we export SCRATCH_DEV in the case we're deducing it
from SCRATCH_DEV_POOL.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reported-by: Filipe David Manana <fdmanana@gmail.com>
---
 common/config | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/config b/common/config
index 4178c27..6fa18e2 100644
--- a/common/config
+++ b/common/config
@@ -360,6 +360,10 @@ parse_config_section() {
 }
 
 get_next_config() {
+	if [ ! -z "$CONFIG_INCLUDED" ] && ! $OPTIONS_HAVE_SECTIONS; then
+		return 0
+	fi
+
 	local OLD_FSTYP=$FSTYP
 	local OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS
 	local OLD_MKFS_OPTIONS=$MKFS_OPTIONS
@@ -414,10 +418,11 @@ get_next_config() {
 	# to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility
 	if [ ! -z "$SCRATCH_DEV_POOL" ]; then
 		if [ ! -z "$SCRATCH_DEV" ]; then
-			echo "common/config: Error: \$SCRATCH_DEV should be unset when \$SCRATCH_DEV_POOL is set"
+			echo "common/config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) should be unset when \$SCRATCH_DEV_POOL ($SCRATCH_DEV_POOL) is set"
 			exit 1
 		fi
 		SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
+		export SCRATCH_DEV
 	fi
 
 	echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
-- 
1.8.3.1

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

[PATCH 2/3] xfstests: Unset SCRATCH_DEV when deduced from SCRATCH_DEV_POOL

[Lukas Czerner]

In the case that we already have sections in the config file we
have to make sure that we unset SCRATCH_DEV if it has been deduced from
the SCRATCH_DEV_POOL so that it does not complain about SCRATCH_DEV in
this case.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 common/config | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/config b/common/config
index 6fa18e2..3163801 100644
--- a/common/config
+++ b/common/config
@@ -372,10 +372,15 @@ get_next_config() {
 	unset MOUNT_OPTIONS
 	unset MKFS_OPTIONS
 	unset FSCK_OPTIONS
+	# We might have deduced SCRATCH_DEV from the SCRATCH_DEV_POOL in the previous
+	# run, so we have to unset it now.
+	if [ "$SCRATCH_DEV_NOT_SET" == "true" ]; then
+		unset SCRATCH_DEV
+	fi
 
 	parse_config_section $1
 
-	if [ -n "$OLD_FSTYP" ] && [ $OLD_FSTYP != $FSTYP ]; then
+	if [ ! -z "$OLD_FSTYP" ] && [ $OLD_FSTYP != $FSTYP ]; then
 		[ -z "$MOUNT_OPTIONS" ] && _mount_opts
 		[ -z "$MKFS_OPTIONS" ] && _mkfs_opts
 		[ -z "$FSCK_OPTIONS" ] && _fsck_opts
@@ -423,6 +428,7 @@ get_next_config() {
 		fi
 		SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
 		export SCRATCH_DEV
+		export SCRATCH_DEV_NOT_SET=true
 	fi
 
 	echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
-- 
1.8.3.1

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

Re: [PATCH 2/3] xfstests: Unset SCRATCH_DEV when deduced from SCRATCH_DEV_POOL

[Filipe David Manana]

On Tue, Apr 8, 2014 at 4:42 PM, Lukas Czerner <lczerner@redhat.com> wrote:
> In the case that we already have sections in the config file we
> have to make sure that we unset SCRATCH_DEV if it has been deduced from
> the SCRATCH_DEV_POOL so that it does not complain about SCRATCH_DEV in
> this case.
>
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Tested-by: Filipe David Manana <fdmanana@gmail.com>

Tests working for btrfs now.
Thanks Lukas.

> ---
>  common/config | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/common/config b/common/config
> index 6fa18e2..3163801 100644
> --- a/common/config
> +++ b/common/config
> @@ -372,10 +372,15 @@ get_next_config() {
>         unset MOUNT_OPTIONS
>         unset MKFS_OPTIONS
>         unset FSCK_OPTIONS
> +       # We might have deduced SCRATCH_DEV from the SCRATCH_DEV_POOL in the previous
> +       # run, so we have to unset it now.
> +       if [ "$SCRATCH_DEV_NOT_SET" == "true" ]; then
> +               unset SCRATCH_DEV
> +       fi
>
>         parse_config_section $1
>
> -       if [ -n "$OLD_FSTYP" ] && [ $OLD_FSTYP != $FSTYP ]; then
> +       if [ ! -z "$OLD_FSTYP" ] && [ $OLD_FSTYP != $FSTYP ]; then
>                 [ -z "$MOUNT_OPTIONS" ] && _mount_opts
>                 [ -z "$MKFS_OPTIONS" ] && _mkfs_opts
>                 [ -z "$FSCK_OPTIONS" ] && _fsck_opts
> @@ -423,6 +428,7 @@ get_next_config() {
>                 fi
>                 SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
>                 export SCRATCH_DEV
> +               export SCRATCH_DEV_NOT_SET=true
>         fi
>
>         echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
> --
> 1.8.3.1
>



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

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

[PATCH 3/3] xfstests: Fix setting FSTYP automatically

[Lukas Czerner]

Currently if the FSTYP is not set, the code to get FSTYP using blikd
would not work. This is because we're using HOSTOS environment variable
which might not be set (at least not on my system) and because it's
already late in the code path.

Fix this by using OSTYP environment variable as a fallback in the case
that HOSTOS does not work and move the check to common/config.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 check         |  8 --------
 common/config | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/check b/check
index 8f1a6e1..ed1834d 100755
--- a/check
+++ b/check
@@ -58,14 +58,6 @@ then
     exit 1
 fi
 
-# Autodetect fs type based on what's on $TEST_DEV unless it's been set
-# externally
-if [ -z "$FSTYP" -a "$HOSTOS" == "Linux" ]; then
-    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-fi
-FSTYP=${FSTYP:=xfs}
-export FSTYP
-
 SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
 SRC_GROUPS="generic shared"
 export SRC_DIR="tests"
diff --git a/common/config b/common/config
index 3163801..00249e6 100644
--- a/common/config
+++ b/common/config
@@ -297,11 +297,6 @@ _fsck_opts()
 	esac
 }
 
-[ -z "$FSTYP" ] && export FSTYP=xfs
-[ -z "$MOUNT_OPTIONS" ] && _mount_opts
-[ -z "$MKFS_OPTIONS" ] && _mkfs_opts
-[ -z "$FSCK_OPTIONS" ] && _fsck_opts
-
 known_hosts()
 {
 	[ "$HOST_CONFIG_DIR" ] || HOST_CONFIG_DIR=`pwd`/configs
@@ -446,6 +441,19 @@ get_next_config() {
 if [ -z "$CONFIG_INCLUDED" ]; then
 	get_next_config `echo $HOST_OPTIONS_SECTIONS | cut -f1 -d" "`
 	export CONFIG_INCLUDED=true
+
+	# Autodetect fs type based on what's on $TEST_DEV unless it's been set
+	# externally
+	if [ -z "$FSTYP" ] && \
+	   [ "$HOSTOS" == "Linux" -o "$OSTYPE" == "linux-gnu" ] && \
+	   [ ! -z "$TEST_DEV" ]; then
+		FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+	fi
+	FSTYP=${FSTYP:=xfs}
+	export FSTYP
+	[ -z "$MOUNT_OPTIONS" ] && _mount_opts
+	[ -z "$MKFS_OPTIONS" ] && _mkfs_opts
+	[ -z "$FSCK_OPTIONS" ] && _fsck_opts
 fi
 
 # make sure this script returns success
-- 
1.8.3.1

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

Re: [PATCH 3/3] xfstests: Fix setting FSTYP automatically

[Filipe David Manana]

On Tue, Apr 8, 2014 at 4:42 PM, Lukas Czerner <lczerner@redhat.com> wrote:
> Currently if the FSTYP is not set, the code to get FSTYP using blikd
> would not work. This is because we're using HOSTOS environment variable
> which might not be set (at least not on my system) and because it's
> already late in the code path.
>
> Fix this by using OSTYP environment variable as a fallback in the case
> that HOSTOS does not work and move the check to common/config.
>
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Tested-by: Filipe David Manana <fdmanana@gmail.com>

Tests working for btrfs now.
Thanks Lukas.

> ---
>  check         |  8 --------
>  common/config | 18 +++++++++++++-----
>  2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/check b/check
> index 8f1a6e1..ed1834d 100755
> --- a/check
> +++ b/check
> @@ -58,14 +58,6 @@ then
>      exit 1
>  fi
>
> -# Autodetect fs type based on what's on $TEST_DEV unless it's been set
> -# externally
> -if [ -z "$FSTYP" -a "$HOSTOS" == "Linux" ]; then
> -    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
> -fi
> -FSTYP=${FSTYP:=xfs}
> -export FSTYP
> -
>  SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
>  SRC_GROUPS="generic shared"
>  export SRC_DIR="tests"
> diff --git a/common/config b/common/config
> index 3163801..00249e6 100644
> --- a/common/config
> +++ b/common/config
> @@ -297,11 +297,6 @@ _fsck_opts()
>         esac
>  }
>
> -[ -z "$FSTYP" ] && export FSTYP=xfs
> -[ -z "$MOUNT_OPTIONS" ] && _mount_opts
> -[ -z "$MKFS_OPTIONS" ] && _mkfs_opts
> -[ -z "$FSCK_OPTIONS" ] && _fsck_opts
> -
>  known_hosts()
>  {
>         [ "$HOST_CONFIG_DIR" ] || HOST_CONFIG_DIR=`pwd`/configs
> @@ -446,6 +441,19 @@ get_next_config() {
>  if [ -z "$CONFIG_INCLUDED" ]; then
>         get_next_config `echo $HOST_OPTIONS_SECTIONS | cut -f1 -d" "`
>         export CONFIG_INCLUDED=true
> +
> +       # Autodetect fs type based on what's on $TEST_DEV unless it's been set
> +       # externally
> +       if [ -z "$FSTYP" ] && \
> +          [ "$HOSTOS" == "Linux" -o "$OSTYPE" == "linux-gnu" ] && \
> +          [ ! -z "$TEST_DEV" ]; then
> +               FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
> +       fi
> +       FSTYP=${FSTYP:=xfs}
> +       export FSTYP
> +       [ -z "$MOUNT_OPTIONS" ] && _mount_opts
> +       [ -z "$MKFS_OPTIONS" ] && _mkfs_opts
> +       [ -z "$FSCK_OPTIONS" ] && _fsck_opts
>  fi
>
>  # make sure this script returns success
> --
> 1.8.3.1
>



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

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

Re: [PATCH 1/3] xfstests: Fix SCRATCH_DEV_POOL handling

[Filipe David Manana]

On Tue, Apr 8, 2014 at 4:42 PM, Lukas Czerner <lczerner@redhat.com> wrote:
> With changes introduced in 667308dd97bf41382d4ab299fa5b56c235cfeb27
> it is no longer possible to use SCRATCH_DEV_POOL variable because of
> error:
>
>  common/config: Error: $SCRATCH_DEV should be unset when
>  $SCRATCH_DEV_POOL is set
>
> This was because get_next_config() would get called twice and hence it
> would complain on the second run that SCRATCH_DEV is already set. Fix
> it by making sure that we call get_next_config() only once if there
> are no sections in the config file.
>
> Also make sure that we export SCRATCH_DEV in the case we're deducing it
> from SCRATCH_DEV_POOL.
>
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> Reported-by: Filipe David Manana <fdmanana@gmail.com>

Tested-by: Filipe David Manana <fdmanana@gmail.com>

Tests working for btrfs now.
Thanks Lukas.

> ---
>  common/config | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/common/config b/common/config
> index 4178c27..6fa18e2 100644
> --- a/common/config
> +++ b/common/config
> @@ -360,6 +360,10 @@ parse_config_section() {
>  }
>
>  get_next_config() {
> +       if [ ! -z "$CONFIG_INCLUDED" ] && ! $OPTIONS_HAVE_SECTIONS; then
> +               return 0
> +       fi
> +
>         local OLD_FSTYP=$FSTYP
>         local OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS
>         local OLD_MKFS_OPTIONS=$MKFS_OPTIONS
> @@ -414,10 +418,11 @@ get_next_config() {
>         # to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility
>         if [ ! -z "$SCRATCH_DEV_POOL" ]; then
>                 if [ ! -z "$SCRATCH_DEV" ]; then
> -                       echo "common/config: Error: \$SCRATCH_DEV should be unset when \$SCRATCH_DEV_POOL is set"
> +                       echo "common/config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) should be unset when \$SCRATCH_DEV_POOL ($SCRATCH_DEV_POOL) is set"
>                         exit 1
>                 fi
>                 SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
> +               export SCRATCH_DEV
>         fi
>
>         echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
> --
> 1.8.3.1
>



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

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

Re: [ANNOUNCE] xfstests: updated to cf1ed54

[Dave Chinner]

On Fri, Apr 04, 2014 at 02:07:16PM +0100, Filipe David Manana wrote:
> On Fri, Apr 4, 2014 at 10:03 AM, Dave Chinner <david@fromorbit.com> wrote:
> > Hi folks,
> >
> > The xfstests repository at git://oss.sgi.com/xfs/cmds/xfstests has
> > just been updated. Patches often get missed, so please check if your
> > outstanding patches were in this update. If they have not been in
> > this update, please resubmit them to xfs@oss.sgi.com so they can be
> > picked up in the next update.
> >
> > The new head of the master branch is commit:
> >
> > cf1ed54 check: fix RESULT_BASE typo in check script
> >
> > The major new functionality worth mentioning in this update is the
> > new config file format from Lukas. The existing format config files
> > should continue to work without change, but the new format is much
> > richer and allows specification of multiple different configurations
> > to run test under. Hence testing multiple mount an dmkfs
> > configurations becomes as simple as iterating the configurations
> > in the config file.
> 
> Hi,
> 
> I might be missing something, but after checking out these changes, I
> am no longer able to run btrfs tests. Example:
> 
> $ ./check btrfs/041
> common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set
> Passed all 0 tests
> 
> $ cat local.config
> export TEST_DEV=/dev/sdb
> export TEST_DIR=/home/fdmanana/btrfs-tests/dev
> export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
> export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"

Are you sure that's the config file that is being picked up? I can't
test btrfs at the moment because it appears to be completely screwed
in a TOT kernel right now - it doesn't even show up in
/proc/filesystems and doesn't emit anything on dmesg to indicate
that initialisation of the built in btrfs code has failed or even
been attempted. It's simply MIA....

However, using that same SCRATCH_DEV_POOL config for xfs or ext4
works just fine on my test machines with the current TOT xfstests
and kernel code.

$ cat configs/test2.config 
TEST_DIR=/mnt/test
SCRATCH_MNT=/mnt/scratch
TEST_DEV=/dev/vda
SCRATCH_DEV_POOL="/dev/vdc /dev/vdd"
$ sudo MKFS_OPTIONS="-m crc=1" ./check generic/001
FSTYP         -- xfs (debug)
PLATFORM      -- Linux/x86_64 test2 3.14.0-rc1-dgc+
MKFS_OPTIONS  -- -f -m crc=1 /dev/vdc
MOUNT_OPTIONS -- /dev/vdc /mnt/scratch

generic/001 4s ... 3s
Ran: generic/001
Passed all 1 tests
$

So, as you can see I can't reproduce your problem myself right now.
Could you add a "set -x" line to the start of check and post the
output?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [ANNOUNCE] xfstests: updated to cf1ed54

[Filipe David Manana]

On Tue, Apr 8, 2014 at 1:14 AM, Dave Chinner <david@fromorbit.com> wrote:
> On Fri, Apr 04, 2014 at 02:07:16PM +0100, Filipe David Manana wrote:
>> On Fri, Apr 4, 2014 at 10:03 AM, Dave Chinner <david@fromorbit.com> wrote:
>> > Hi folks,
>> >
>> > The xfstests repository at git://oss.sgi.com/xfs/cmds/xfstests has
>> > just been updated. Patches often get missed, so please check if your
>> > outstanding patches were in this update. If they have not been in
>> > this update, please resubmit them to xfs@oss.sgi.com so they can be
>> > picked up in the next update.
>> >
>> > The new head of the master branch is commit:
>> >
>> > cf1ed54 check: fix RESULT_BASE typo in check script
>> >
>> > The major new functionality worth mentioning in this update is the
>> > new config file format from Lukas. The existing format config files
>> > should continue to work without change, but the new format is much
>> > richer and allows specification of multiple different configurations
>> > to run test under. Hence testing multiple mount an dmkfs
>> > configurations becomes as simple as iterating the configurations
>> > in the config file.
>>
>> Hi,
>>
>> I might be missing something, but after checking out these changes, I
>> am no longer able to run btrfs tests. Example:
>>
>> $ ./check btrfs/041
>> common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set
>> Passed all 0 tests
>>
>> $ cat local.config
>> export TEST_DEV=/dev/sdb
>> export TEST_DIR=/home/fdmanana/btrfs-tests/dev
>> export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
>> export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"
>
> Are you sure that's the config file that is being picked up? I can't
> test btrfs at the moment because it appears to be completely screwed
> in a TOT kernel right now - it doesn't even show up in
> /proc/filesystems and doesn't emit anything on dmesg to indicate
> that initialisation of the built in btrfs code has failed or even
> been attempted. It's simply MIA....
>
> However, using that same SCRATCH_DEV_POOL config for xfs or ext4
> works just fine on my test machines with the current TOT xfstests
> and kernel code.
>
> $ cat configs/test2.config
> TEST_DIR=/mnt/test
> SCRATCH_MNT=/mnt/scratch
> TEST_DEV=/dev/vda
> SCRATCH_DEV_POOL="/dev/vdc /dev/vdd"
> $ sudo MKFS_OPTIONS="-m crc=1" ./check generic/001
> FSTYP         -- xfs (debug)
> PLATFORM      -- Linux/x86_64 test2 3.14.0-rc1-dgc+
> MKFS_OPTIONS  -- -f -m crc=1 /dev/vdc
> MOUNT_OPTIONS -- /dev/vdc /mnt/scratch
>
> generic/001 4s ... 3s
> Ran: generic/001
> Passed all 1 tests
> $
>
> So, as you can see I can't reproduce your problem myself right now.
> Could you add a "set -x" line to the start of check and post the
> output?

Ok, here's some more tests:

# On origin/master:

root 16:56:42 /home/fdmanana/git/hub/xfstests ((cf1ed54...))> cat local.config
export TEST_DEV=/dev/sdb
export TEST_DIR=/home/fdmanana/btrfs-tests/dev
export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"
export FSTYP=btrfs

root 16:56:49 /home/fdmanana/git/hub/xfstests ((cf1ed54...))> ./check
generic/001
common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set
Passed all 0 tests

# Now going back to an older revision, it works as I showed before:

root 16:56:56 /home/fdmanana/git/hub/xfstests ((cf1ed54...))> git
checkout 3948694eb12e9699f558fab5e8169a8b090780d1
Previous HEAD position was cf1ed54... check: fix RESULT_BASE typo in
check script
HEAD is now at 3948694... xfs/300: fix golden output

root 16:57:11 /home/fdmanana/git/hub/xfstests ((3948694...))> ./check
generic/001
FSTYP         -- btrfs
PLATFORM      -- Linux/x86_64 debian-vm3 3.13.0-fdm-btrfs-next-24+
MKFS_OPTIONS  -- /dev/sdc
MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1

generic/001 23s ... 23s
Ran: generic/001
Passed all 1 tests

# Now if I change my config and remove the definition of FSTYP, it
still works with the old revision:

root 16:59:19 /home/fdmanana/git/hub/xfstests ((3948694...))> cat local.config
# Ideally define at least these 4 to match your environment
# The first 2 are required.
# See README for other variables which can be set.
#
# Note: SCRATCH_DEV >will< get overwritten!

export TEST_DEV=/dev/sdb
export TEST_DIR=/home/fdmanana/btrfs-tests/dev
export SCRATCH_MNT="/home/fdmanana/btrfs-tests/scratch_1"
export SCRATCH_DEV_POOL="/dev/sdc /dev/sdd"
# export FSTYP=btrfs

root 16:59:22 /home/fdmanana/git/hub/xfstests ((3948694...))> ./check
generic/001
FSTYP         -- btrfs
PLATFORM      -- Linux/x86_64 debian-vm3 3.13.0-fdm-btrfs-next-24+
MKFS_OPTIONS  -- /dev/sdc
MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1

generic/001 23s ... 23s
Ran: generic/001
Passed all 1 tests

# Now going back to master, without FSTYP set, it doesn't work too:

root 16:59:50 /home/fdmanana/git/hub/xfstests ((3948694...))> git
checkout origin/master
Previous HEAD position was 3948694... xfs/300: fix golden output
HEAD is now at cf1ed54... check: fix RESULT_BASE typo in check script

root 16:59:57 /home/fdmanana/git/hub/xfstests ((cf1ed54...))> ./check
generic/001
common/rc: Error: $TEST_DEV (/dev/sdb) is not a MOUNTED xfs filesystem
Filesystem     Type  1024-blocks  Used Available Capacity Mounted on
/dev/sdb       btrfs    20971520   768  18845184       1%
/home/fdmanana/btrfs-tests/dev
root 17:00:00 /home/fdmanana/git/hub/xfstests ((cf1ed54...))>


After adding set -x to the top of the 'check' script, here's the
output when running current master:

https://friendpaste.com/6x8Hzq3wJxe2KXZypomCiY

And for the revision that works:  https://friendpaste.com/6x8Hzq3wJxe2KXZyppKkwB

Hope it helps.
Thanks



>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

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