From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com
Subject: [PATCH 05/23] common/dmerror: add some more dmerror routines
Date: Mon, 08 Feb 2016 17:12:17 -0800 [thread overview]
Message-ID: <20160209011217.23099.26572.stgit@birch.djwong.org> (raw)
In-Reply-To: <20160209011145.23099.95354.stgit@birch.djwong.org>
Add functions to the dmerror routine so that we can load both the
error table and the linear table. This will help us with EIO testing
of copy-on-write.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
common/dmerror | 27 +++++++++++++++++++++++++--
tests/btrfs/100 | 2 +-
tests/btrfs/101 | 2 +-
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/common/dmerror b/common/dmerror
index 3900a4e..004530d 100644
--- a/common/dmerror
+++ b/common/dmerror
@@ -46,15 +46,23 @@ _dmerror_mount()
_mount -t $FSTYP `_dmerror_mount_options $*`
}
+_dmerror_unmount()
+{
+ umount $SCRATCH_MNT
+}
+
_dmerror_cleanup()
{
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
$DMSETUP_PROG remove error-test > /dev/null 2>&1
}
-_dmerror_load_table()
+_dmerror_load_error_table()
{
- $DMSETUP_PROG suspend error-test
+ suspend_opt="--nolockfs"
+ [ $# -gt 1 ] && [ $2 -eq 1 ] && suspend_opt=""
+
+ $DMSETUP_PROG suspend $suspend_opt error-test
[ $? -ne 0 ] && _fail "dmsetup suspend failed"
$DMSETUP_PROG load error-test --table "$DMERROR_TABLE"
@@ -63,3 +71,18 @@ _dmerror_load_table()
$DMSETUP_PROG resume error-test
[ $? -ne 0 ] && _fail "dmsetup resume failed"
}
+
+_dmerror_load_working_table()
+{
+ suspend_opt="--nolockfs"
+ [ $# -gt 1 ] && [ $2 -eq 1 ] && suspend_opt=""
+
+ $DMSETUP_PROG suspend $suspend_opt error-test
+ [ $? -ne 0 ] && _fail "dmsetup suspend failed"
+
+ $DMSETUP_PROG load error-test --table "$DMLINEAR_TABLE"
+ [ $? -ne 0 ] && _fail "dmsetup failed to load error table"
+
+ $DMSETUP_PROG resume error-test
+ [ $? -ne 0 ] && _fail "dmsetup resume failed"
+}
diff --git a/tests/btrfs/100 b/tests/btrfs/100
index 080d0ae..cd385e1 100755
--- a/tests/btrfs/100
+++ b/tests/btrfs/100
@@ -69,7 +69,7 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x \
"$snapshot_cmd" -X 50
# now load the error into the DMERROR_DEV
-_dmerror_load_table
+_dmerror_load_error_table
_run_btrfs_util_prog replace start -B $error_devid $dev2 $SCRATCH_MNT
diff --git a/tests/btrfs/101 b/tests/btrfs/101
index 0824de1..8d7af85 100755
--- a/tests/btrfs/101
+++ b/tests/btrfs/101
@@ -70,7 +70,7 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x \
"$snapshot_cmd" -X 50
# now load the error into the DMERROR_DEV
-_dmerror_load_table
+_dmerror_load_error_table
_run_btrfs_util_prog device delete $error_devid $SCRATCH_MNT
WARNING: multiple messages have this Message-ID (diff)
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com
Subject: [PATCH 05/23] common/dmerror: add some more dmerror routines
Date: Mon, 08 Feb 2016 17:12:17 -0800 [thread overview]
Message-ID: <20160209011217.23099.26572.stgit@birch.djwong.org> (raw)
In-Reply-To: <20160209011145.23099.95354.stgit@birch.djwong.org>
Add functions to the dmerror routine so that we can load both the
error table and the linear table. This will help us with EIO testing
of copy-on-write.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
common/dmerror | 27 +++++++++++++++++++++++++--
tests/btrfs/100 | 2 +-
tests/btrfs/101 | 2 +-
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/common/dmerror b/common/dmerror
index 3900a4e..004530d 100644
--- a/common/dmerror
+++ b/common/dmerror
@@ -46,15 +46,23 @@ _dmerror_mount()
_mount -t $FSTYP `_dmerror_mount_options $*`
}
+_dmerror_unmount()
+{
+ umount $SCRATCH_MNT
+}
+
_dmerror_cleanup()
{
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
$DMSETUP_PROG remove error-test > /dev/null 2>&1
}
-_dmerror_load_table()
+_dmerror_load_error_table()
{
- $DMSETUP_PROG suspend error-test
+ suspend_opt="--nolockfs"
+ [ $# -gt 1 ] && [ $2 -eq 1 ] && suspend_opt=""
+
+ $DMSETUP_PROG suspend $suspend_opt error-test
[ $? -ne 0 ] && _fail "dmsetup suspend failed"
$DMSETUP_PROG load error-test --table "$DMERROR_TABLE"
@@ -63,3 +71,18 @@ _dmerror_load_table()
$DMSETUP_PROG resume error-test
[ $? -ne 0 ] && _fail "dmsetup resume failed"
}
+
+_dmerror_load_working_table()
+{
+ suspend_opt="--nolockfs"
+ [ $# -gt 1 ] && [ $2 -eq 1 ] && suspend_opt=""
+
+ $DMSETUP_PROG suspend $suspend_opt error-test
+ [ $? -ne 0 ] && _fail "dmsetup suspend failed"
+
+ $DMSETUP_PROG load error-test --table "$DMLINEAR_TABLE"
+ [ $? -ne 0 ] && _fail "dmsetup failed to load error table"
+
+ $DMSETUP_PROG resume error-test
+ [ $? -ne 0 ] && _fail "dmsetup resume failed"
+}
diff --git a/tests/btrfs/100 b/tests/btrfs/100
index 080d0ae..cd385e1 100755
--- a/tests/btrfs/100
+++ b/tests/btrfs/100
@@ -69,7 +69,7 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x \
"$snapshot_cmd" -X 50
# now load the error into the DMERROR_DEV
-_dmerror_load_table
+_dmerror_load_error_table
_run_btrfs_util_prog replace start -B $error_devid $dev2 $SCRATCH_MNT
diff --git a/tests/btrfs/101 b/tests/btrfs/101
index 0824de1..8d7af85 100755
--- a/tests/btrfs/101
+++ b/tests/btrfs/101
@@ -70,7 +70,7 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x \
"$snapshot_cmd" -X 50
# now load the error into the DMERROR_DEV
-_dmerror_load_table
+_dmerror_load_error_table
_run_btrfs_util_prog device delete $error_devid $SCRATCH_MNT
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-02-09 1:12 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 1:11 [PATCH v4.1 00/23] xfstests: test the nfs/cifs/btrfs/xfs reflink/dedupe ioctls Darrick J. Wong
2016-02-09 1:11 ` Darrick J. Wong
2016-02-09 1:11 ` [PATCH 01/23] generic/182: this is a dedupe test, check for dedupe Darrick J. Wong
2016-02-09 1:11 ` Darrick J. Wong
2016-02-09 1:11 ` [PATCH 02/23] xfstests: filter whitespace in 128 and 132 Darrick J. Wong
2016-02-09 1:11 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 03/23] xfstests: make _scratch_mkfs_blocksized usable Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 04/23] reflink: remove redundant filesystem checks from the end of the tests Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong [this message]
2016-02-09 1:12 ` [PATCH 05/23] common/dmerror: add some more dmerror routines Darrick J. Wong
2016-02-09 1:12 ` [PATCH 06/23] dio unwritten conversion bug tests Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 7:37 ` Dave Chinner
2016-02-09 7:37 ` Dave Chinner
2016-02-09 8:08 ` Darrick J. Wong
2016-02-09 8:08 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 07/23] reflink: test intersecting CoW and falloc/fpunch/fzero/fcollapse/finsert/ftrunc Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 08/23] reflink: test CoW behavior with IO errors Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 09/23] reflink: test CoW operations against the source file Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 10/23] xfs: more reflink tests Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 7:36 ` Dave Chinner
2016-02-09 7:36 ` Dave Chinner
2016-02-09 8:16 ` Darrick J. Wong
2016-02-09 8:16 ` Darrick J. Wong
2016-02-09 1:12 ` [PATCH 11/23] reflink: ensure that we can handle reflinking a lot of extents Darrick J. Wong
2016-02-09 1:12 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 12/23] xfs/122: support refcount/rmap data structures Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 7:43 ` Dave Chinner
2016-02-09 7:43 ` Dave Chinner
2016-02-09 7:55 ` Darrick J. Wong
2016-02-09 7:55 ` Darrick J. Wong
2016-02-09 8:53 ` Dave Chinner
2016-02-09 8:53 ` Dave Chinner
2016-02-09 1:13 ` [PATCH 13/23] xfs: test fragmentation characteristics of copy-on-write Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 8:01 ` Dave Chinner
2016-02-09 8:01 ` Dave Chinner
2016-02-10 1:02 ` Darrick J. Wong
2016-02-10 1:02 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 14/23] reflink: high offset reflink and dedupe tests Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 15/23] reflink: test xfs cow behavior when the filesystem crashes Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 16/23] reflink: test quota accounting Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 17/23] reflink: test CoW across a mixed range of block types with cowextsize set Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 8:09 ` Dave Chinner
2016-02-09 8:09 ` Dave Chinner
2016-02-10 1:03 ` Darrick J. Wong
2016-02-10 1:03 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 18/23] xfs: test the automatic cowextsize extent garbage collector Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 8:15 ` Dave Chinner
2016-02-09 8:15 ` Dave Chinner
2016-02-10 1:06 ` Darrick J. Wong
2016-02-10 1:06 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 19/23] xfs: test rmapbt functionality Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 8:26 ` Dave Chinner
2016-02-09 8:26 ` Dave Chinner
2016-02-10 1:07 ` Darrick J. Wong
2016-02-10 1:07 ` Darrick J. Wong
2016-02-09 1:13 ` [PATCH 20/23] reflink: test aio copy on write Darrick J. Wong
2016-02-09 1:13 ` Darrick J. Wong
2016-02-09 1:14 ` [PATCH 21/23] xfs: aio cow tests Darrick J. Wong
2016-02-09 1:14 ` Darrick J. Wong
2016-02-09 8:32 ` Dave Chinner
2016-02-09 8:32 ` Dave Chinner
2016-02-09 21:51 ` Darrick J. Wong
2016-02-09 21:51 ` Darrick J. Wong
2016-02-09 1:14 ` [PATCH 22/23] xfs: test xfs_getbmapx behavior with shared extents Darrick J. Wong
2016-02-09 1:14 ` Darrick J. Wong
2016-02-09 1:14 ` [PATCH 23/23] reflink: test reflink+cow+enospc all at the same time Darrick J. Wong
2016-02-09 1:14 ` Darrick J. Wong
2016-02-09 7:21 ` [PATCH v4.1 00/23] xfstests: test the nfs/cifs/btrfs/xfs reflink/dedupe ioctls Dave Chinner
2016-02-09 7:21 ` Dave Chinner
2016-02-09 7:25 ` Darrick J. Wong
2016-02-09 7:25 ` Darrick J. Wong
2016-02-09 7:50 ` Darrick J. Wong
2016-02-09 7:50 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160209011217.23099.26572.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.