From: Amir Goldstein <amir73il@gmail.com>
To: Eryu Guan <eguan@redhat.com>
Cc: Josef Bacik <jbacik@fb.com>, Christoph Hellwig <hch@lst.de>,
fstests@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [RFC][PATCH 7/8] fstests: add support for working with dm-log-writes target
Date: Wed, 23 Aug 2017 18:49:16 +0300 [thread overview]
Message-ID: <1503503357-26234-8-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1503503357-26234-1-git-send-email-amir73il@gmail.com>
Cherry-picked the relevant common bits from commit 70d41e17164b
in Josef Bacik's fstests tree (https://github.com/josefbacik/fstests).
Quoting from Josef's commit message:
This patch adds the supporting code for using the dm-log-writes
target. The dmlogwrites code is similar to the dmflakey code, it just
gives us functions to build and tear down a dm-log-writes target. We
add a new LOGWRITES_DEV variable to take in the device we will use as
the log and add checks for that.
[Amir:]
- Removed unneeded _test_falloc_support
- Moved _require_log_writes to dmlogwrites
- Document _require_log_writes
Cc: Josef Bacik <jbacik@fb.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
README | 2 ++
common/dmlogwrites | 86 ++++++++++++++++++++++++++++++++++++++++++++
doc/requirement-checking.txt | 20 +++++++++++
3 files changed, 108 insertions(+)
create mode 100644 common/dmlogwrites
diff --git a/README b/README
index 9456fa7..4963d28 100644
--- a/README
+++ b/README
@@ -91,6 +91,8 @@ Preparing system for tests:
- set TEST_XFS_SCRUB=1 to have _check_xfs_filesystem run
xfs_scrub -vd to scrub the filesystem metadata online before
unmounting to run the offline check.
+ - setenv LOGWRITES_DEV to a block device to use for power fail
+ testing.
- or add a case to the switch in common/config assigning
these variables based on the hostname of your test
diff --git a/common/dmlogwrites b/common/dmlogwrites
new file mode 100644
index 0000000..50e209d
--- /dev/null
+++ b/common/dmlogwrites
@@ -0,0 +1,86 @@
+##/bin/bash
+#
+# Copyright (c) 2015 Facebook, 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
+#
+#
+# common functions for setting up and tearing down a dm log-writes device
+
+_require_log_writes()
+{
+ _require_dm_target log-writes
+ _require_test_program "log-writes/replay-log"
+}
+
+_init_log_writes()
+{
+ local BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
+ LOGWRITES_NAME=logwrites-test
+ LOGWRITES_DMDEV=/dev/mapper/$LOGWRITES_NAME
+ LOGWRITES_TABLE="0 $BLK_DEV_SIZE log-writes $SCRATCH_DEV $LOGWRITES_DEV"
+ $DMSETUP_PROG create $LOGWRITES_NAME --table "$LOGWRITES_TABLE" || \
+ _fatal "failed to create log-writes device"
+ $DMSETUP_PROG mknodes > /dev/null 2>&1
+}
+
+_log_writes_mark()
+{
+ [ $# -ne 1 ] && _fatal "_log_writes_mark takes one argument"
+ $DMSETUP_PROG message $LOGWRITES_NAME 0 mark $1
+}
+
+_log_writes_mkfs()
+{
+ _scratch_options mkfs
+ _mkfs_dev $SCRATCH_OPTIONS $LOGWRITES_DMDEV
+ _log_writes_mark mkfs
+}
+
+_mount_log_writes()
+{
+ mount -t $FSTYP $MOUNT_OPTIONS $* $LOGWRITES_DMDEV $SCRATCH_MNT
+}
+
+_unmount_log_writes()
+{
+ $UMOUNT_PROG $SCRATCH_MNT
+}
+
+# _replay_log <mark>
+#
+# This replays the log contained on $INTEGRITY_DEV onto $SCRATCH_DEV upto the
+# mark passed in.
+_replay_log()
+{
+ _mark=$1
+
+ $here/src/log-writes/replay-log --log $LOGWRITES_DEV --replay $SCRATCH_DEV \
+ --end-mark $_mark > /dev/null 2>&1
+ [ $? -ne 0 ] && _fatal "replay failed"
+}
+
+_log_writes_remove()
+{
+ $DMSETUP_PROG remove $LOGWRITES_NAME > /dev/null 2>&1
+ $DMSETUP_PROG mknodes > /dev/null 2>&1
+}
+
+_cleanup_log_writes()
+{
+ # If dmsetup load fails then we need to make sure to do resume here
+ # otherwise the umount will hang
+ $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _log_writes_remove
+}
diff --git a/doc/requirement-checking.txt b/doc/requirement-checking.txt
index 95d10e6..4e01b1f 100644
--- a/doc/requirement-checking.txt
+++ b/doc/requirement-checking.txt
@@ -21,6 +21,10 @@ they have. This is done with _require_<xxx> macros, which may take parameters.
_require_statx
+ (4) Device mapper requirement.
+
+ _require_dm_target
+ _require_log_writes
====================
GENERAL REQUIREMENTS
@@ -102,3 +106,19 @@ _require_statx
The test requires the use of the statx() system call and will be skipped
if it isn't available in the kernel.
+
+
+==========================
+DEVICE MAPPER REQUIREMENTS
+==========================
+
+_require_dm_target <name>
+
+ The test requires the use of the device mapper target and will be skipped
+ if it isn't available in the kernel.
+
+_require_log_writes
+
+ The test requires the use of the device mapper target log-writes.
+ The test also requires the test program log-writes/replay-log is built
+ and will be skipped if either isn't available.
--
2.7.4
next prev parent reply other threads:[~2017-08-23 15:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 15:49 [RFC][PATCH 0/8] Crash consistency xfstest using dm-log-writes Amir Goldstein
2017-08-23 15:49 ` [RFC][PATCH 1/8] common/rc: convert some egrep to grep Amir Goldstein
2017-08-23 15:49 ` [RFC][PATCH 2/8] common/rc: fix _require_xfs_io_command params check Amir Goldstein
2017-08-23 15:49 ` [RFC][PATCH 3/8] fsx: fixes to random seed Amir Goldstein
2017-08-23 15:49 ` [RFC][PATCH 4/8] fsx: fix path of .fsx* files Amir Goldstein
2017-08-23 15:49 ` [RFC][PATCH 5/8] fsx: add support for integrity check with dm-log-writes target Amir Goldstein
2017-08-23 15:49 ` [RFC][PATCH 6/8] log-writes: add replay-log program to replay " Amir Goldstein
2017-08-23 15:49 ` Amir Goldstein [this message]
2017-08-23 15:58 ` [RFC][PATCH 7/8] fstests: add support for working with " Amir Goldstein
2017-08-23 16:51 ` Josef Bacik
2017-08-23 15:49 ` [RFC][PATCH 8/8] fstests: add crash consistency fsx test using dm-log-writes Amir Goldstein
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=1503503357-26234-8-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=hch@lst.de \
--cc=jbacik@fb.com \
--cc=linux-fsdevel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).