From: Eryu Guan <eguan@redhat.com>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Josef Bacik <jbacik@fb.com>,
"Darrick J . Wong" <darrick.wong@oracle.com>,
Christoph Hellwig <hch@lst.de>,
fstests@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: Re: [PATCH v2 13/14] fstests: add support for working with dm-log-writes target
Date: Tue, 5 Sep 2017 19:22:34 +0800 [thread overview]
Message-ID: <20170905112234.GE8034@eguan.usersys.redhat.com> (raw)
In-Reply-To: <1504104706-11965-14-git-send-email-amir73il@gmail.com>
On Wed, Aug 30, 2017 at 05:51:45PM +0300, Amir Goldstein wrote:
> 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 | 84 ++++++++++++++++++++++++++++++++++++++++++++
> doc/requirement-checking.txt | 20 +++++++++++
> 3 files changed, 106 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..a36724d
> --- /dev/null
> +++ b/common/dmlogwrites
> @@ -0,0 +1,84 @@
> +##/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
I think we need to _notrun if testing with dax mount option? Like all
other dm target tests do.
> +
> +_require_log_writes()
> +{
> + _require_dm_target log-writes
> + _require_test_program "log-writes/replay-log"
As you mentioned before, need to check the existence of LOGWRITES_DEV
first. And is the size of LOGWRITES_DEV required to be => SCRATCH_DEV?
I guess so.
> +}
> +
> +_init_log_writes()
Seems the function names are not unified in this file, some are in
vert.-noun. format, some are in noun.-verb. format. Better to use the
same format across the file, either all prefixed with "_log_writes"
(except _require_log_writes) or suffixed with it.
> +{
> + local BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
> + LOGWRITES_NAME=logwrites-test
Not a big deal, but LOGWRITES_DEVNAME seems better to me.
> + 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"
I think s/_fatal/_fail/g should be OK in this file.
> + $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
$MOUNT_PROG, and I think we can follow _dmerror_mount() for this mount
function.
> +}
> +
> +_unmount_log_writes()
> +{
> + $UMOUNT_PROG $SCRATCH_MNT
> +}
> +
> +# _replay_log <mark>
_replay_log looks like replaying filesystem log/journal, prefixed with
_log_writes? So I guess we're going the "_log_writes_<verb>" way :)
> +#
> +# This replays the log contained on $INTEGRITY_DEV onto $SCRATCH_DEV upto the
^^^^^^^^^^^^^^ LOGWRITES_DEV
> +# 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
Dump output to $seqres.full for debug purpose?
Thanks,
Eryu
> + [ $? -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()
> +{
> + $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-09-05 11:22 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 14:51 [PATCH v2 00/14] Crash consistency xfstest using dm-log-writes Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 01/14] common/rc: convert some egrep to grep Amir Goldstein
2017-08-30 15:45 ` Darrick J. Wong
2017-08-30 14:51 ` [PATCH v2 02/14] common/rc: fix _require_xfs_io_command params check Amir Goldstein
2017-08-30 16:17 ` Darrick J. Wong
2017-08-30 14:51 ` [PATCH v2 03/14] fsx: fixes to random seed Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 04/14] fsx: fix path of .fsx* files Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 05/14] fsx: fix compile warnings Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 06/14] fsx: add support for integrity check with dm-log-writes target Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 07/14] fsx: add optional logid prefix to log messages Amir Goldstein
2017-09-05 10:46 ` Eryu Guan
2017-09-05 11:24 ` Amir Goldstein
2017-09-05 11:31 ` Eryu Guan
2017-09-07 7:10 ` Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 08/14] fsx: add support for --record-ops Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 09/14] fsx: add support for -g filldata Amir Goldstein
2017-09-05 10:50 ` Eryu Guan
2017-09-05 11:29 ` Amir Goldstein
2017-09-05 11:33 ` Eryu Guan
2017-08-30 14:51 ` [PATCH v2 10/14] log-writes: add replay-log program to replay dm-log-writes target Amir Goldstein
2017-09-05 11:03 ` Eryu Guan
2017-09-05 13:40 ` Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 11/14] replay-log: output log replay offset in verbose mode Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 12/14] replay-log: add support for replaying ops in target device sector range Amir Goldstein
2017-09-05 11:07 ` Eryu Guan
2017-09-05 11:41 ` Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 13/14] fstests: add support for working with dm-log-writes target Amir Goldstein
2017-09-05 11:22 ` Eryu Guan [this message]
2017-09-05 15:15 ` Amir Goldstein
2017-08-30 14:51 ` [PATCH v2 14/14] fstests: add crash consistency fsx test using dm-log-writes Amir Goldstein
2017-09-05 11:28 ` Eryu Guan
2017-09-05 11:52 ` Amir Goldstein
2017-08-30 15:04 ` [PATCH v2 00/14] Crash consistency xfstest " Amir Goldstein
2017-08-30 15:23 ` Josef Bacik
2017-08-30 18:39 ` Amir Goldstein
2017-08-30 18:55 ` Josef Bacik
2017-08-30 19:43 ` Amir Goldstein
[not found] ` <CAOQ4uxjt-zZ7_iE7ZYUcp8qWYUH=aDLSum70Dmbnth-5smFQ+A@mail.gmail.com>
[not found] ` <20170831134320.lnyu4jibsm3amuk7@destiny>
[not found] ` <CAOQ4uxhgOYDfRxZ74RNd=omOMHxF2MgP+wLe0O6HO7+emnrMfA@mail.gmail.com>
[not found] ` <20170831205403.2tene34ccvw55yo7@destiny>
2017-09-01 6:52 ` Amir Goldstein
2017-09-01 7:03 ` Josef Bacik
2017-09-01 20:07 ` Josef Bacik
2017-09-03 13:39 ` Amir Goldstein
2017-09-04 6:42 ` Dave Chinner
2017-09-04 6:49 ` Amir Goldstein
2018-05-25 8:58 ` Amir Goldstein
2017-08-31 3:38 ` Eryu Guan
2017-08-31 4:29 ` Amir Goldstein
2017-09-01 7:29 ` Amir Goldstein
2017-09-01 7:45 ` Eryu Guan
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=20170905112234.GE8034@eguan.usersys.redhat.com \
--to=eguan@redhat.com \
--cc=amir73il@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=hch@lst.de \
--cc=jbacik@fb.com \
--cc=linux-xfs@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