Skip to contentSkip to conversation

xfstests patches

PATCH In review Eric Sandeen 6 participants 25 messages Mar 13, 2013 – Mar 19, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

cover xfstests patches

2 pretty simple ones, and a new btrfs test

[PATCH 1/3] xfstests: add 274 to the prealloc group [PATCH 2/3] xfstests: keep newlines out of SCRATCH_DEV_POOL [PATCH 3/3] xfstests: btrfs tests for basic informational commands

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw

PATCH 1/3 xfstests: add 274 to the prealloc group

test 274 does preallocation tests but is not in the prealloc group.

---
 group |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
group +1 -1
index c3c4161..8096968 100644
@@ -397,7 +397,7 @@ stress
 271 auto rw quick
 272 auto enospc rw
 273 auto rw
-274 auto rw
+274 auto rw prealloc
 275 auto rw
 276 auto rw metadata
 277 auto ioctl quick metadata
Signature · 6 lines
1.7.1

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#3 lore raw

PATCH 2/3 xfstests: keep newlines out of SCRATCH_DEV_POOL

In reply to Eric Sandeen

SCRATCH_DEV_POOL processing actually takes the first device out for SCRATCH_DEV and leaves the rest in SCRATCH_DEV_POOL.

I'm not totally sold on that behavior, but for now, at least don't populate SCRATCH_DEV_POOL with newlines.

---
 common.config |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
common.config +1 -1
index ed0f44c..5ac58bf 100644
@@ -258,7 +258,7 @@ if [ ! -z "$SCRATCH_DEV_POOL" ]; then
         exit 1
     fi
     SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
-    SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | awk '{ for (i = 2; i <= NF; i++) print $i}'`
+    SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | awk '{ ORS=" "; for (i = 2; i <= NF; i++) print $i}'`
 fi
 
 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
Signature · 1 line
1.7.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] xfstests: keep newlines out of SCRATCH_DEV_POOL

Quoted 20 lines · Eric Sandeen

SCRATCH_DEV_POOL processing actually takes the first device out for SCRATCH_DEV and leaves the rest in SCRATCH_DEV_POOL.

I'm not totally sold on that behavior, but for now, at least don't populate SCRATCH_DEV_POOL with newlines.

---
  common.config |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
common.config +0 -0
index ed0f44c..5ac58bf 100644

common.config if [ ! -z "$SCRATCH_DEV_POOL" ]; then · line 264

Quoted 8 lines
common.config +1 -1
@@ -258,7 +258,7 @@ if [ ! -z "$SCRATCH_DEV_POOL" ]; then
          exit 1
      fi
      SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
-    SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | awk '{ for (i = 2; i <= NF; i++) print $i}'`
+    SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | awk '{ ORS=" "; for (i = 2; i <= NF; i++) print $i}'`
  fi
 
  echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1

Is the purpose of this patch is so future improvements will be able to parse/use SCRATCH_DEV_POOL easier from within bash?

Looks good Eric.

Regards
--Rich

#5 lore raw

Re: [PATCH 2/3] xfstests: keep newlines out of SCRATCH_DEV_POOL

Quoted 27 lines · Rich Johnston
Quoted 26 lines · Eric Sandeen

SCRATCH_DEV_POOL processing actually takes the first device out for SCRATCH_DEV and leaves the rest in SCRATCH_DEV_POOL.

I'm not totally sold on that behavior, but for now, at least don't populate SCRATCH_DEV_POOL with newlines.

---
  common.config |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
common.config +1 -1
index ed0f44c..5ac58bf 100644
@@ -258,7 +258,7 @@ if [ ! -z "$SCRATCH_DEV_POOL" ]; then
          exit 1
      fi
      SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
-    SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | awk '{ for (i = 2; i <= NF; i++) print $i}'`
+    SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | awk '{ ORS=" "; for (i = 2; i <= NF; i++) print $i}'`
  fi
 
Quoted 4 lines

common.config if [ ! -z "$SCRATCH_DEV_POOL" ]; then · line 264

Quoted 2 lines
common.config +0 -0
  echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1

Is the purpose of this patch is so future improvements will be able to parse/use SCRATCH_DEV_POOL easier from within bash?

Yep, and just generally since it's used as an argument, feeding a string w/ newlines to any command is just a bit odd.

-Eric

Quoted 6 lines

Looks good Eric.

Regards
--Rich

#6 lore raw

PATCH 3/3 xfstests: btrfs tests for basic informational commands

In reply to Eric Sandeen

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accomodate the output of the new commands.

---
 313           |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 313.out       |   51 ++++++++++++++++++++++++++++++
 btrfs.filter  |   47 ++++++++++++++++++++++++++++
 common.filter |   24 ++++++++++++++
 group         |    1 +
 5 files changed, 219 insertions(+), 0 deletions(-)
 create mode 100755 313
 create mode 100644 313.out
 create mode 100644 btrfs.filter
313 new file +96 -0
new file mode 100755
index 0000000..6effb0e
@@ -0,0 +1,96 @@
+#! /bin/bash
+# FS QA Test No. 313
+#
+# run basic btrfs information commands in various ways
+# sanity tests: filesystem show, label, sync, and device stats
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Red Hat, Inc.  All Rights Reserved.
+#
+# 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
+#-----------------------------------------------------------------------
+#
+# creator
[email protected]
+
+seq=`basename $0`
+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
+. ./btrfs.filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_scratch_dev_pool
+
+rm -f $seq.full
+
+FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
+LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
+TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
+LABEL=TestLabel.$seq
+
+echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
+
+_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
+
+# These have to be done unmounted...?
+echo "== Set filesystem label to $LABEL"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV $LABEL
+echo "== Get filesystem label"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV
+
+echo "== Mount."
+_scratch_mount
+
+echo "== Show filesystem by label"
+$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
+UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
+
+echo "UUID $UUID" >> $seq.full
+
+echo "== Show filesystem by UUID"
+$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
+
+echo "== Sync filesystem"
+$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
+
+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +51 -0

51 lines not on this page · raw message

btrfs.filter new file +47 -0

47 lines not on this page · raw message

common.filter +24 -0
index c854a98..4de9d3d 100644
@@ -226,6 +226,13 @@ _filter_scratch()
 	sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
 }
 
+# Turn any device in the scratch pool into SCRATCH_DEV
+_filter_scratch_pool()
+{
+	FILTER_STRINGS=`echo $SCRATCH_DEV_POOL | sed -e 's/\s\+/\\\|/g'`
+	sed -e "s,$FILTER_STRINGS,SCRATCH_DEV,g"
+}
+
 _filter_spaces()
 {
        sed -e 's/ [ ]*/ /g'
@@ -238,5 +245,22 @@ _filter_ln()
 	    -e "s,failed to create,creating,"
 }
 
+# If given an arg, filter *that* UUID string
+# Otherwise look for something that looks like a generic UUID
+_filter_uuid()
+{
+	if [ ! -z $1 ]; then
+		sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i"
+	else
+		sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i"
+	fi
+}
+
+# Filter out sizes like 6.14MB etc
+_filter_size()
+{
+	sed -e "s/[0-9\.]\+\s\?[b|k|m|g|t][b]\?/<SIZE>/ig"
+}
+
 # make sure this script returns success
 /bin/true
group +1 -0
index 8096968..fcbdfb6 100644
@@ -429,3 +429,4 @@ stress
 303 aio dangerous ioctl rw stress
 304 aio dangerous ioctl rw stress
 305 aio dangerous enospc rw stress
+313 auto quick
Signature · 1 line
1.7.1
#7 lore raw

Re: [PATCH 3/3] xfstests: btrfs tests for basic informational commands

On Wed, 13 Mar 2013 09:57:03 -0500, Eric Sandeen wrote:
[...]

Quoted 2 lines

+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats

Is the number of devices in SCRATCH_DEV_POOL fixed to 3? Otherwise you should pipe the device-stats-by-mountpoint through "head -10" to avoid failures if the number of devices is != 3.
Possible additional checks (but I am not sure that we really need this additional level of detail in this check) would be:
1. The number of lines is 5 * number of devices.
2. The 5-line block that is printed for each device always looks the same (after applying _filter_btrfs_device_stats).

Quoted 39 lines
313 new file +10 -0
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +23 -0
new file mode 100644
index 0000000..1aa59a1
@@ -0,0 +1,51 @@
+== QA output created by 313
+== Set filesystem label to TestLabel.313
+== Get filesystem label
+TestLabel.313
+== Mount.
+== Show filesystem by label
+Label: 'TestLabel.313'  uuid: <UUID>
+	Total devices <EXACTNUM> FS bytes used <SIZE>
+	devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
+
+== Show filesystem by UUID
+Label: 'TestLabel.313'  uuid: <EXACTUUID>
+	Total devices <EXACTNUM> FS bytes used <SIZE>
+	devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
+
+== Sync filesystem
+FSSync 'SCRATCH_MNT'
+== Show device stats by mountpoint
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>

313.out line 33

Quoted 10 lines
313.out new file +10 -0
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>

3 devices in this case.

Quoted 18 lines
313.out new file +18 -0
+== Show device stats by first/scratch dev
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>
+== Show device stats by second dev
+[FIRST_POOL_DEV].write_io_errs   0
+[FIRST_POOL_DEV].read_io_errs    0
+[FIRST_POOL_DEV].flush_io_errs   0
+[FIRST_POOL_DEV].corruption_errs 0
+[FIRST_POOL_DEV].generation_errs 0
+== Show device stats by last dev
+[LAST_POOL_DEV].write_io_errs   0
+[LAST_POOL_DEV].read_io_errs    0
+[LAST_POOL_DEV].flush_io_errs   0
+[LAST_POOL_DEV].corruption_errs 0
+[LAST_POOL_DEV].generation_errs 0

[...]

#8 lore raw

Re: [PATCH 3/3] xfstests: btrfs tests for basic informational commands

Quoted 8 lines · Stefan Behrens

On Wed, 13 Mar 2013 09:57:03 -0500, Eric Sandeen wrote:
[...]

Quoted 2 lines

+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats

Is the number of devices in SCRATCH_DEV_POOL fixed to 3? Otherwise you should pipe the device-stats-by-mountpoint through "head -10" to avoid failures if the number of devices is != 3.

Oh, you are right.

I had meant to filter device stats through "uniq" after replacing all devices & numbers. I'll add that, then I think it should be ok.

thanks for catching that.

Quoted 5 lines

Possible additional checks (but I am not sure that we really need this additional level of detail in this check) would be:
1. The number of lines is 5 * number of devices.
2. The 5-line block that is printed for each device always looks the same (after applying _filter_btrfs_device_stats).

hm, perhaps - I wonder if that might be fragile? I guess if *any* output changes, the test will break . . .

Thanks for the review!
-Eric

Quoted 43 lines
Quoted 43 lines
313 new file +10 -0
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +27 -0
new file mode 100644
index 0000000..1aa59a1
@@ -0,0 +1,51 @@
+== QA output created by 313
+== Set filesystem label to TestLabel.313
+== Get filesystem label
+TestLabel.313
+== Mount.
+== Show filesystem by label
+Label: 'TestLabel.313'  uuid: <UUID>
+	Total devices <EXACTNUM> FS bytes used <SIZE>
+	devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
+
+== Show filesystem by UUID
+Label: 'TestLabel.313'  uuid: <EXACTUUID>
+	Total devices <EXACTNUM> FS bytes used <SIZE>
+	devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
+
+== Sync filesystem
+FSSync 'SCRATCH_MNT'
+== Show device stats by mountpoint
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
Quoted 8 lines

313.out line 28

Quoted 6 lines
313.out new file +6 -0
+[SCRATCH_DEV].generation_errs <NUM>
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>

3 devices in this case.

Yep, oops.

Quoted 20 lines
Quoted 18 lines
313.out new file +18 -0
+== Show device stats by first/scratch dev
+[SCRATCH_DEV].write_io_errs   <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].generation_errs <NUM>
+== Show device stats by second dev
+[FIRST_POOL_DEV].write_io_errs   0
+[FIRST_POOL_DEV].read_io_errs    0
+[FIRST_POOL_DEV].flush_io_errs   0
+[FIRST_POOL_DEV].corruption_errs 0
+[FIRST_POOL_DEV].generation_errs 0
+== Show device stats by last dev
+[LAST_POOL_DEV].write_io_errs   0
+[LAST_POOL_DEV].read_io_errs    0
+[LAST_POOL_DEV].flush_io_errs   0
+[LAST_POOL_DEV].corruption_errs 0
+[LAST_POOL_DEV].generation_errs 0

[...]

#9 lore raw

Re: [PATCH 3/3] xfstests: btrfs tests for basic informational commands

Looks good Eric, but I will wait for Stefan to look at this version to make sure all his comments have been addressed, then I will commit this series. Thanks for the patchset.

Regards
--Rich

#10 lore raw

PATCH v2 3/3 xfstests: btrfs tests for basic informational commands

In reply to Eric Sandeen

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

---

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

313 new file +96 -0
new file mode 100755
index 0000000..579b0d3
@@ -0,0 +1,96 @@
+#! /bin/bash
+# FS QA Test No. 313
+#
+# run basic btrfs information commands in various ways
+# sanity tests: filesystem show, label, sync, and device stats
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Red Hat, Inc.  All Rights Reserved.
+#
+# 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
+#-----------------------------------------------------------------------
+#
+# creator
[email protected]
+
+seq=`basename $0`
+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
+. ./btrfs.filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_scratch_dev_pool
+
+rm -f $seq.full
+
+FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
+LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
+TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
+LABEL=TestLabel.$seq
+
+echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
+
+_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
+
+# These have to be done unmounted...?
+echo "== Set filesystem label to $LABEL"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV $LABEL
+echo "== Get filesystem label"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV
+
+echo "== Mount."
+_scratch_mount
+
+echo "== Show filesystem by label"
+$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
+UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
+
+echo "UUID $UUID" >> $seq.full
+
+echo "== Show filesystem by UUID"
+$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
+
+echo "== Sync filesystem"
+$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
+
+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats $TOTAL_DEVS
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +41 -0

41 lines not on this page · raw message

btrfs.filter new file +60 -0

60 lines not on this page · raw message

common.filter +24 -0
index c854a98..4de9d3d 100644
@@ -226,6 +226,13 @@ _filter_scratch()
 	sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
 }
 
+# Turn any device in the scratch pool into SCRATCH_DEV
+_filter_scratch_pool()
+{
+	FILTER_STRINGS=`echo $SCRATCH_DEV_POOL | sed -e 's/\s\+/\\\|/g'`
+	sed -e "s,$FILTER_STRINGS,SCRATCH_DEV,g"
+}
+
 _filter_spaces()
 {
        sed -e 's/ [ ]*/ /g'
@@ -238,5 +245,22 @@ _filter_ln()
 	    -e "s,failed to create,creating,"
 }
 
+# If given an arg, filter *that* UUID string
+# Otherwise look for something that looks like a generic UUID
+_filter_uuid()
+{
+	if [ ! -z $1 ]; then
+		sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i"
+	else
+		sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i"
+	fi
+}
+
+# Filter out sizes like 6.14MB etc
+_filter_size()
+{
+	sed -e "s/[0-9\.]\+\s\?[b|k|m|g|t][b]\?/<SIZE>/ig"
+}
+
 # make sure this script returns success
 /bin/true
group +1 -0
index 8096968..fc33125 100644
@@ -429,3 +429,4 @@ stress
 303 aio dangerous ioctl rw stress
 304 aio dangerous ioctl rw stress
 305 aio dangerous enospc rw stress
+313 auto quick
#11 lore raw

PATCH v3 3/3 xfstests: btrfs tests for basic informational commands

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

---

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

313 new file +96 -0
new file mode 100755
index 0000000..579b0d3
@@ -0,0 +1,96 @@
+#! /bin/bash
+# FS QA Test No. 313
+#
+# run basic btrfs information commands in various ways
+# sanity tests: filesystem show, label, sync, and device stats
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Red Hat, Inc.  All Rights Reserved.
+#
+# 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
+#-----------------------------------------------------------------------
+#
+# creator
[email protected]
+
+seq=`basename $0`
+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
+. ./btrfs.filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_scratch_dev_pool
+
+rm -f $seq.full
+
+FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
+LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
+TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
+LABEL=TestLabel.$seq
+
+echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
+
+_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
+
+# These have to be done unmounted...?
+echo "== Set filesystem label to $LABEL"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV $LABEL
+echo "== Get filesystem label"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV
+
+echo "== Mount."
+_scratch_mount
+
+echo "== Show filesystem by label"
+$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
+UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
+
+echo "UUID $UUID" >> $seq.full
+
+echo "== Show filesystem by UUID"
+$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
+
+echo "== Sync filesystem"
+$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
+
+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats $TOTAL_DEVS
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +41 -0

41 lines not on this page · raw message

btrfs.filter new file +60 -0

60 lines not on this page · raw message

common.filter +25 -0
index c854a98..c34809f 100644
@@ -226,6 +226,13 @@ _filter_scratch()
 	sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
 }
 
+# Turn any device in the scratch pool into SCRATCH_DEV
+_filter_scratch_pool()
+{
+	FILTER_STRINGS=`echo $SCRATCH_DEV_POOL | sed -e 's/\s\+/\\\|/g'`
+	sed -e "s,$FILTER_STRINGS,SCRATCH_DEV,g"
+}
+
 _filter_spaces()
 {
        sed -e 's/ [ ]*/ /g'
@@ -238,5 +245,23 @@ _filter_ln()
 	    -e "s,failed to create,creating,"
 }
 
+# If given an arg, filter *that* UUID string
+# Otherwise look for something that looks like a generic UUID
+_filter_uuid()
+{
+	if [ ! -z $1 ]; then
+		UUID=$1
+		sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i"
+	else
+		sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i"
+	fi
+}
+
+# Filter out sizes like 6.14MB etc
+_filter_size()
+{
+	sed -e "s/[0-9\.]\+\s\?[b|k|m|g|t][b]\?/<SIZE>/ig"
+}
+
 # make sure this script returns success
 /bin/true
group +1 -0
index 8096968..fcbdfb6 100644
@@ -429,3 +429,4 @@ stress
 303 aio dangerous ioctl rw stress
 304 aio dangerous ioctl rw stress
 305 aio dangerous enospc rw stress
+313 auto quick
Reviewed-by on v3 3/3
#12 lore raw

Re: [PATCH 3/3 V3] xfstests: btrfs tests for basic informational commands

Quoted 283 lines · Eric Sandeen

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

---

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

313 new file +96 -0
new file mode 100755
index 0000000..579b0d3
@@ -0,0 +1,96 @@
+#! /bin/bash
+# FS QA Test No. 313
+#
+# run basic btrfs information commands in various ways
+# sanity tests: filesystem show, label, sync, and device stats
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Red Hat, Inc.  All Rights Reserved.
+#
+# 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
+#-----------------------------------------------------------------------
+#
+# creator
[email protected]
+
+seq=`basename $0`
+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
+. ./btrfs.filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_scratch_dev_pool
+
+rm -f $seq.full
+
+FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
+LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
+TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
+LABEL=TestLabel.$seq
+
+echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
+
+_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
+
+# These have to be done unmounted...?
+echo "== Set filesystem label to $LABEL"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV $LABEL
+echo "== Get filesystem label"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV
+
+echo "== Mount."
+_scratch_mount
+
+echo "== Show filesystem by label"
+$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
+UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
+
+echo "UUID $UUID" >> $seq.full
+
+echo "== Show filesystem by UUID"
+$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
+
+echo "== Sync filesystem"
+$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
+
+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats $TOTAL_DEVS
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +41 -0
new file mode 100644
index 0000000..f513bdd
@@ -0,0 +1,41 @@
+== QA output created by 313
+== Set filesystem label to TestLabel.313
+== Get filesystem label
+TestLabel.313
+== Mount.
+== Show filesystem by label
+Label: 'TestLabel.313'  uuid: <UUID>
+	Total devices <EXACTNUM> FS bytes used <SIZE>
+	devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
+
+== Show filesystem by UUID
+Label: 'TestLabel.313'  uuid: <EXACTUUID>
+	Total devices <EXACTNUM> FS bytes used <SIZE>
+	devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
+
+== Sync filesystem
+FSSync 'SCRATCH_MNT'
+== Show device stats by mountpoint
+      <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM>
+      <NUMDEVS> [SCRATCH_DEV].flush_io_errs   <NUM>
+      <NUMDEVS> [SCRATCH_DEV].generation_errs <NUM>
+      <NUMDEVS> [SCRATCH_DEV].read_io_errs    <NUM>
+      <NUMDEVS> [SCRATCH_DEV].write_io_errs   <NUM>
+== Show device stats by first/scratch dev
+[SCRATCH_DEV].corruption_errs <NUM>
+[SCRATCH_DEV].flush_io_errs   <NUM>
+[SCRATCH_DEV].generation_errs <NUM>
+[SCRATCH_DEV].read_io_errs    <NUM>
+[SCRATCH_DEV].write_io_errs   <NUM>
+== Show device stats by second dev
+[FIRST_POOL_DEV].write_io_errs   0
+[FIRST_POOL_DEV].read_io_errs    0
+[FIRST_POOL_DEV].flush_io_errs   0
+[FIRST_POOL_DEV].corruption_errs 0
+[FIRST_POOL_DEV].generation_errs 0
+== Show device stats by last dev
+[LAST_POOL_DEV].write_io_errs   0
+[LAST_POOL_DEV].read_io_errs    0
+[LAST_POOL_DEV].flush_io_errs   0
+[LAST_POOL_DEV].corruption_errs 0
+[LAST_POOL_DEV].generation_errs 0
btrfs.filter new file +60 -0
new file mode 100644
index 0000000..8a749bf
@@ -0,0 +1,60 @@
+# Filters for btrfs command output
+
+. ./common.filter
+
+# Some, but not all, commands emit "Btrfs <version>"
+_filter_btrfs_version()
+{
+	sed -e "s/^Btrfs.*//g"
+}
+
+_filter_devid()
+{
+	sed -e "s/\(devid\s\+\)[0-9]\+/\1 <DEVID>/g"
+}
+
+# If passed a number as first arg, filter that number of devices
+# If passed a UUID as second arg, filter that exact UUID
+_filter_btrfs_filesystem_show()
+{
+	if [ ! -z $1 ]; then
+		NUMDEVS=$1
+		NUM_SUBST="<EXACTNUM>"
+	else
+		NUMDEVS="[0-9]\+"
+		NUM_SUBST="<NUM>"
+	fi
+
+	UUID=""
+	if [ ! -z $2 ]; then
+		UUID=$2
+	fi
+
+	# the uniq collapses all device lines into 1
+	_filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
+	_filter_size | _filter_btrfs_version | _filter_devid | \
+	sed -e "s/\(Total devices\) $NUMDEVS/\1 $NUM_SUBST/g" | \
+	uniq
+}
+
+# This eliminates all numbers, and shows only unique lines,
+# to accomodate a varying nr. of devices.
+# If given an argument, make sure we saw that many devices
+# in total.
+_filter_btrfs_device_stats()
+{
+	if [ ! -z $1 ]; then
+		NUMDEVS=$1
+		UNIQ_OPT="-c"
+	else
+		NUMDEVS="thiswillnotmatch"
+		UNIQ=""
+	fi
+
+	_filter_scratch | _filter_scratch_pool | \
+	sed -e "s/[0-9]\+$/<NUM>/g" | sort | uniq $UNIQ_OPT | \
+	sed -e "s/$NUMDEVS /<NUMDEVS> /g"
+}
+
+# make sure this script returns success
+/bin/true
common.filter +25 -0
index c854a98..c34809f 100644
@@ -226,6 +226,13 @@ _filter_scratch()
 	sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
 }
 
+# Turn any device in the scratch pool into SCRATCH_DEV
+_filter_scratch_pool()
+{
+	FILTER_STRINGS=`echo $SCRATCH_DEV_POOL | sed -e 's/\s\+/\\\|/g'`
+	sed -e "s,$FILTER_STRINGS,SCRATCH_DEV,g"
+}
+
 _filter_spaces()
 {
        sed -e 's/ [ ]*/ /g'
@@ -238,5 +245,23 @@ _filter_ln()
 	    -e "s,failed to create,creating,"
 }
 
+# If given an arg, filter *that* UUID string
+# Otherwise look for something that looks like a generic UUID
+_filter_uuid()
+{
+	if [ ! -z $1 ]; then
+		UUID=$1
+		sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i"
+	else
+		sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i"
+	fi
+}
+
+# Filter out sizes like 6.14MB etc
+_filter_size()
+{
+	sed -e "s/[0-9\.]\+\s\?[b|k|m|g|t][b]\?/<SIZE>/ig"
+}
+
 # make sure this script returns success
 /bin/true
group +0 -0
index 8096968..fcbdfb6 100644

group stress · line 432

Quoted 4 lines
group +1 -0
@@ -429,3 +429,4 @@ stress
 303 aio dangerous ioctl rw stress
 304 aio dangerous ioctl rw stress
 305 aio dangerous enospc rw stress
+313 auto quick
#13 lore raw

PATCH v4 3/3 xfstests: btrfs tests for basic informational commands

In reply to Eric Sandeen

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

---

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

V4: fix stats filter to set UNIQ_OPT in both cases, ugh.

313 new file +96 -0
new file mode 100755
index 0000000..579b0d3
@@ -0,0 +1,96 @@
+#! /bin/bash
+# FS QA Test No. 313
+#
+# run basic btrfs information commands in various ways
+# sanity tests: filesystem show, label, sync, and device stats
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Red Hat, Inc.  All Rights Reserved.
+#
+# 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
+#-----------------------------------------------------------------------
+#
+# creator
[email protected]
+
+seq=`basename $0`
+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
+. ./btrfs.filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_scratch_dev_pool
+
+rm -f $seq.full
+
+FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
+LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
+TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
+LABEL=TestLabel.$seq
+
+echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
+
+_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
+
+# These have to be done unmounted...?
+echo "== Set filesystem label to $LABEL"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV $LABEL
+echo "== Get filesystem label"
+$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV
+
+echo "== Mount."
+_scratch_mount
+
+echo "== Show filesystem by label"
+$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
+UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
+
+echo "UUID $UUID" >> $seq.full
+
+echo "== Show filesystem by UUID"
+$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
+
+echo "== Sync filesystem"
+$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
+
+echo "== Show device stats by mountpoint"
+$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats $TOTAL_DEVS
+echo "== Show device stats by first/scratch dev"
+$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
+echo "== Show device stats by second dev"
+$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
+echo "== Show device stats by last dev"
+$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
+
+# success, all done
+status=0
+exit
313.out new file +41 -0

41 lines not on this page · raw message

btrfs.filter new file +60 -0

60 lines not on this page · raw message

common.filter +25 -0
index c854a98..c34809f 100644
@@ -226,6 +226,13 @@ _filter_scratch()
 	sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
 }
 
+# Turn any device in the scratch pool into SCRATCH_DEV
+_filter_scratch_pool()
+{
+	FILTER_STRINGS=`echo $SCRATCH_DEV_POOL | sed -e 's/\s\+/\\\|/g'`
+	sed -e "s,$FILTER_STRINGS,SCRATCH_DEV,g"
+}
+
 _filter_spaces()
 {
        sed -e 's/ [ ]*/ /g'
@@ -238,5 +245,23 @@ _filter_ln()
 	    -e "s,failed to create,creating,"
 }
 
+# If given an arg, filter *that* UUID string
+# Otherwise look for something that looks like a generic UUID
+_filter_uuid()
+{
+	if [ ! -z $1 ]; then
+		UUID=$1
+		sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i"
+	else
+		sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i"
+	fi
+}
+
+# Filter out sizes like 6.14MB etc
+_filter_size()
+{
+	sed -e "s/[0-9\.]\+\s\?[b|k|m|g|t][b]\?/<SIZE>/ig"
+}
+
 # make sure this script returns success
 /bin/true
group +1 -0
index 8096968..fcbdfb6 100644
@@ -429,3 +429,4 @@ stress
 303 aio dangerous ioctl rw stress
 304 aio dangerous ioctl rw stress
 305 aio dangerous enospc rw stress
+313 auto quick

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#14 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

Stefan,

Thanks for reviewing this patch, may I put your Reviewed-by: on this version?

Thanks
--Rich

#16 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

In reply to Eric Sandeen
Quoted 13 lines · Eric Sandeen

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

---

Quoted 8 lines

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

V4: fix stats filter to set UNIQ_OPT in both cases, ugh.

Something I just noticed in this commit:

Quoted 3 lines

+# get standard environment, filters and checks
+. ./common.rc
+. ./btrfs.filter

That should probably have been named "common.filter.btrfs". I found this updating my patchset that moves all the common.* files into a common/ directory....

I'll rename it to common/filter.btrfs....

Cheers,

Dave.

Signature · 2 lines
Dave Chinner
[email protected]
#17 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

Yep sorry. I figure its always a race in numbers do I don't bother with fixing them up. Should I?

Quoted 33 lines · Dave Chinner
Quoted 13 lines · Eric Sandeen

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

---

Quoted 8 lines

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

V4: fix stats filter to set UNIQ_OPT in both cases, ugh.

Something I just noticed in this commit:

Quoted 3 lines

+# get standard environment, filters and checks
+. ./common.rc
+. ./btrfs.filter

That should probably have been named "common.filter.btrfs". I found this updating my patchset that moves all the common.* files into a common/ directory....

Quoted 12 lines

I'll rename it to common/filter.btrfs....

Cheers,

Dave.

Signature · 6 lines
Dave Chinner
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#18 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

Quoted 2 lines · Eric Sandeen

Yep sorry. I figure its always a race in numbers do I don't bother with fixing them up. Should I?

Eric,
I was going to revert and resubmit as test 306, is that OK with you?

Quoted 25 lines · Dave Chinner
Quoted 24 lines · Eric Sandeen
Quoted 21 lines

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also add2730c49a3s quite a few new filters to accommodate the output of the new commands.

---

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

V4: fix stats filter to set UNIQ_OPT in both cases, ugh.

Quoted 7 lines
Quoted 7 lines

Something I just noticed in this commit:

Quoted 3 lines

+# get standard environment, filters and checks
+. ./common.rc
+. ./btrfs.filter

That should probably have been named "common.filter.btrfs".

Dave,
Do you want me to rename btrfs.filter to common.filter.btrfs when I resubmit this patch?

Regards
--Rich

Quoted 16 lines
Quoted 7 lines

I found this updating my patchset that moves all the common.* files into a common/ directory....

I'll rename it to common/filter.btrfs....

Cheers,

Quoted 8 lines

Dave.
--
Dave Chinner
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#19 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

Quoted 6 lines · Rich Johnston
Quoted 1 line · Eric Sandeen

Yep sorry. I figure its always a race in numbers do I don't bother with fixing them up. Should I?

Eric,
I was going to revert and resubmit as test 306, is that OK with you?

Sure, of course.

Thanks,
Eric

Quoted 61 lines
Quoted 25 lines · Dave Chinner
Quoted 24 lines · Eric Sandeen
Quoted 21 lines

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also add2730c49a3s quite a few new filters to accommodate the output of the new commands.

---

V2: sort & uniq device stats output to account for variable nrs. of devices. Optionally check that the proper nr. of devices was returned, as well.

V3: _filter_uuid needs to pay attention to $1, not hope that the caller has set $UUID. Oops.

V4: fix stats filter to set UNIQ_OPT in both cases, ugh.

Quoted 7 lines
Quoted 7 lines

Something I just noticed in this commit:

Quoted 3 lines

+# get standard environment, filters and checks
+. ./common.rc
+. ./btrfs.filter

That should probably have been named "common.filter.btrfs".

Dave,
Do you want me to rename btrfs.filter to common.filter.btrfs when I resubmit this patch?

Regards
--Rich

Quoted 20 lines
Quoted 7 lines

I found this updating my patchset that moves all the common.* files into a common/ directory....

I'll rename it to common/filter.btrfs....

Cheers,

Quoted 8 lines

Dave.
--
Dave Chinner
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#20 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

Dave,

Sorry for skipping test numbers, I was going to revert, correct the test number and resubmit this patch. Do you want me to rename btrfs.filter to common.filter.btrfs when I
resubmit this patch?

Regards
--Rich

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by Stefan Behrens
#21 lore raw

Re: [PATCH 3/3 V4] xfstests: btrfs tests for basic informational commands

In reply to Eric Sandeen

This has been reverted and recommitted as test 307.

Thanks
--Rich

commit 4f092a2e681c57394a0055a0735b8208bf83ec5f

Author: Eric Sandeen <[email protected]>
Date:   Wed Mar 13 19:01:58 2013 +0000

xfstests: btrfs tests for basic informational commands

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

commit 609b6f18b87bc19c5251c45342e0678cfbf0618c

Author: Rich Johnston <[email protected]>
Date:   Tue Mar 19 08:13:12 2013 -0500

Revert "xfstests: btrfs tests for basic informational commands"

This reverts commit 2730c49a3e80426167e6f9984b070883dc51d4b6.

Test number was not sequential.

Conflicts:

group

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by Stefan Behrens Reviewed-by on the v1 series
#22 lore raw
In reply to Eric Sandeen
Quoted 11 lines · Eric Sandeen

2 pretty simple ones, and a new btrfs test

[PATCH 1/3] xfstests: add 274 to the prealloc group [PATCH 2/3] xfstests: keep newlines out of SCRATCH_DEV_POOL [PATCH 3/3] xfstests: btrfs tests for basic informational commands

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

This series has been committed.

Thanks
--Rich

commit 2730c49a3e80426167e6f9984b070883dc51d4b6

Author: Eric Sandeen <[email protected]>
Date:   Wed Mar 13 19:01:58 2013 +0000

xfstests: btrfs tests for basic informational commands

Run basic btrfs information commands in various ways, performing sanity tests of: filesystem show, label, sync, and device stats (sync is included just because it's simple). These are mostly just smoke tests, although for example show by label & UUID should verify that the correct fs was shown.

This also adds quite a few new filters to accommodate the output of the new commands.

commit d6e352916fbe835432bac2aa835bac440fe44287

Author: Eric Sandeen <[email protected]>
Date:   Wed Mar 13 14:57:02 2013 +0000

xfstests: keep newlines out of SCRATCH_DEV_POOL

SCRATCH_DEV_POOL processing actually takes the first device out for SCRATCH_DEV and leaves the rest in SCRATCH_DEV_POOL.

I'm not totally sold on that behavior, but for now, at least don't populate SCRATCH_DEV_POOL with newlines.

commit e279134e14800f1d7b34093a93e304b5bed7ec4d

Author: Eric Sandeen <[email protected]>
Date:   Wed Mar 13 14:57:01 2013 +0000

xfstests: add 274 to the prealloc group

test 274 does preallocation tests but is not in the prealloc group.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#23 lore raw
Quoted 7 lines · Rich Johnston
Quoted 6 lines · Eric Sandeen

2 pretty simple ones, and a new btrfs test

[PATCH 1/3] xfstests: add 274 to the prealloc group [PATCH 2/3] xfstests: keep newlines out of SCRATCH_DEV_POOL [PATCH 3/3] xfstests: btrfs tests for basic informational commands

Quoted 7 lines
Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

This series has been committed.

Rich, can you please be careful to check the test numbers being used in patches that are sent to the list before you commit them?

Quoted 1 line
Quoted 1 line

[PATCH 3/3] xfstests: btrfs tests for basic informational commands

This test was numbered 313, and so now we have tests 001-306 and 313 in the repository. I noticed that Another of Eric's recent patches is numbered 315, so it will also need renumbering before commit.

-Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#24 lore raw
Quoted 19 lines · Dave Chinner
Quoted 7 lines · Rich Johnston
Quoted 6 lines · Eric Sandeen

2 pretty simple ones, and a new btrfs test

[PATCH 1/3] xfstests: add 274 to the prealloc group [PATCH 2/3] xfstests: keep newlines out of SCRATCH_DEV_POOL [PATCH 3/3] xfstests: btrfs tests for basic informational commands

Quoted 7 lines
Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

This series has been committed.

Rich, can you please be careful to check the test numbers being used in patches that are sent to the list before you commit them?

Quoted 8 lines
Quoted 1 line
Quoted 1 line

[PATCH 3/3] xfstests: btrfs tests for basic informational commands

This test was numbered 313, and so now we have tests 001-306 and 313 in the repository. I noticed that Another of Eric's recent patches is numbered 315, so it will also need renumbering before commit.

-Dave.

Yes I will, sorry it applied so cleanly and I was trying to get it committed before I left for the day I overlooked the numbering. I will revert and recommit it with the correct number 306. Thanks for pointing that out.

Regards
--Rich

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs