From patchwork Wed Aug 23 15:49:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9917665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A10BD603FA for ; Wed, 23 Aug 2017 15:49:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9318A281C3 for ; Wed, 23 Aug 2017 15:49:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87FD62846D; Wed, 23 Aug 2017 15:49:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14BB0281C3 for ; Wed, 23 Aug 2017 15:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932321AbdHWPtE (ORCPT ); Wed, 23 Aug 2017 11:49:04 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36107 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932277AbdHWPtB (ORCPT ); Wed, 23 Aug 2017 11:49:01 -0400 Received: by mail-wm0-f68.google.com with SMTP id p17so522117wmd.3; Wed, 23 Aug 2017 08:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZAuoiNaShS2ttmWBFQbjFoa5F20Ie4NdT9ZKdl8slWM=; b=hHsoWZXqGOQMQk2QgzDem8Waptg5HIXraBbdvZAdPySwcRTlrQQ7w4T7dMuqQPOxgD WaCjxhtnJpnyXBnrHyAynarGkxX3+7Ef7M/uRu01M3pfwjflGP+/fLKOszP2dDEWmEhM GOOT689HTppdrrzznfTfnWzncSNbCRWhykQuVlkgV2KTivVosD3KW6BVvO8w4yJHIc0/ X/8+4BNRNdtm21ZztG20nzgi+4auOyVv9uf1/Go7AxkmYOmlYoe0LTJR2dY2dVLjsAc9 hwPPHNpaAxdqghTLRCw9jgFwukb/FGFYka0tlKZdxiDEjXu6RHB8XJWUusTd5iiSewTR FVWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZAuoiNaShS2ttmWBFQbjFoa5F20Ie4NdT9ZKdl8slWM=; b=uYFqth96ujHVyj3HMHACONa2wJRBv4BTIZKhd0oiggdmJYqmuuF5LtocqtJkVZraAZ TfhT6LzCHxrcfjQX+lw0RMbvq0Up50Pff89chxbH1kSQMedzRTDHZ5EFHzn88X5eZRVx xu7ueeG8epOHXhzwZLROCIT/VtMVubQT6hcHLw/vrgW65GK+0wCL3b/5B39DqQljDlMG wCOAMTUQjAavYRKO83+0t+1BhdDQ1amVvUMTI94shWcIiBpMrg2deFDRndWDkbZGL0Jf FNywxNLd0PGwTr57hRc+l9uQUUZUnukPFrb6+sIruEupfoLiqiQYsqPBZw/9wHmMuT6t k2/A== X-Gm-Message-State: AHYfb5jszpq5lZ8K4Qrl/F0XIUR+uBeXnEoxD6KI1JVowIRRmuUgtIIY ftbwVkDQt1mCLw== X-Received: by 10.28.213.203 with SMTP id m194mr1858204wmg.41.1503503340253; Wed, 23 Aug 2017 08:49:00 -0700 (PDT) Received: from localhost.localdomain (bzq-79-182-137-119.red.bezeqint.net. [79.182.137.119]) by smtp.gmail.com with ESMTPSA id a6sm1938879wrh.51.2017.08.23.08.48.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Aug 2017 08:48:59 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Josef Bacik , Christoph Hellwig , 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 Message-Id: <1503503357-26234-8-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503503357-26234-1-git-send-email-amir73il@gmail.com> References: <1503503357-26234-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Amir Goldstein --- 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 +# +# 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_ 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 + + 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.