From patchwork Tue Sep 5 19:11: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: 9939533 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 544A760350 for ; Tue, 5 Sep 2017 19:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 452B5289F2 for ; Tue, 5 Sep 2017 19:11:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A4DA28A00; Tue, 5 Sep 2017 19:11:13 +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 B131C289F2 for ; Tue, 5 Sep 2017 19:11:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752620AbdIETLL (ORCPT ); Tue, 5 Sep 2017 15:11:11 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34282 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576AbdIETLG (ORCPT ); Tue, 5 Sep 2017 15:11:06 -0400 Received: by mail-wm0-f68.google.com with SMTP id l19so696729wmi.1; Tue, 05 Sep 2017 12:11:05 -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=77ROjvvxkmo5pWIRQMQmj/uAman618aRgAAamIKB7Po=; b=nuT3EThf9sP+WD65D9Z8Dfe5ZpQ1yT6aH65cJ9J7uy+uRCTBQwqyhYC3cjXrBAFw6y 8T6v3A438aeMY2m/iBixqDHWMkkKiWN2eAQeN5mavofsLnkF1CGWmOYMhEXSCu6r7q7D C1sYIbSx73nqjiy29pj99gnZtHK+QbPY5kqLKNNpv1ouSgpJKCVDgIYzog8rBpH6Nnr8 thgOuIFLpyM3WZoeYmXWV46G7NJO4LrF7A7D4n1xADs6KHvw3CEjm64AnTnSqWVrT9es OZGeYPWdAHNbJjA792xF+GxPMWSuHiCQNCDEzD5ne1kewhKD9z/QO0kxJzYxvUAIQPrV aW3g== 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=77ROjvvxkmo5pWIRQMQmj/uAman618aRgAAamIKB7Po=; b=pylOsbxc9Vl0NtUkSHN9876g/Z439afQNiyRCQqf0rJ/IRvZiKPNlCix14Ke+2pkh4 z87kGAy7DCLXgQPP/gO9B/Jysdyl1Yajji7GpZWojXllYMYHkPV8bkKoOFCNKBJgddOV 0tsUbXHNzhP299CbOIMg71bNlp2EL0zJQymHHJZVRqgrxlgQwR3dLvFz69cYFLFT9sQj ulgse2oogkYRbmknhaEsbm/tc2Y3iei9upBV48+HFzmdl53eMu+HAwQqX/gHSU0vPJHb pNLqjtCTBvE6JtFfyG/DWpJLnzAQg2h5Qz7yIiUaIvBDkHmSTM5CuLne9qaJhYk1uZay cg4w== X-Gm-Message-State: AHPjjUgyfLq4fLGBWXricMRUiGdr45bvtP50LKiiZBqN1tF4yjwMgnic nkounIZx971Vzg== X-Google-Smtp-Source: ADKCNb5xiE8KDbvgDXb/fgRHywd+qyShxWgpiOndU10M0Sgzj1XMcJ0CmUKTEyU7OEz33u5SU89QEQ== X-Received: by 10.28.154.138 with SMTP id c132mr33541wme.2.1504638665091; Tue, 05 Sep 2017 12:11:05 -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 30sm1829015wry.34.2017.09.05.12.11.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Sep 2017 12:11:04 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Josef Bacik , fstests@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 09/13] fstests: add support for working with dm-log-writes target Date: Tue, 5 Sep 2017 22:11:16 +0300 Message-Id: <1504638680-25682-10-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504638680-25682-1-git-send-email-amir73il@gmail.com> References: <1504638680-25682-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 - Address review comments by Eryu Guan Cc: Josef Bacik Signed-off-by: Amir Goldstein --- README | 2 + common/dmlogwrites | 94 ++++++++++++++++++++++++++++++++++++++++++++ doc/requirement-checking.txt | 20 ++++++++++ 3 files changed, 116 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..592b047 --- /dev/null +++ b/common/dmlogwrites @@ -0,0 +1,94 @@ +##/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 + +echo $MOUNT_OPTIONS | grep -q dax +if [ $? -eq 0 ]; then + _notrun "Cannot run tests with DAX on dmerror devices" +fi + +_require_log_writes() +{ + [ -z "$LOGWRITES_DEV" -o ! -b "$LOGWRITES_DEV" ] && \ + _notrun "This test requires a valid \$LOGWRITES_DEV" + + _require_dm_target log-writes + _require_test_program "log-writes/replay-log" +} + +_log_writes_init() +{ + 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" || \ + _fail "failed to create log-writes device" + $DMSETUP_PROG mknodes > /dev/null 2>&1 +} + +_log_writes_mark() +{ + [ $# -ne 1 ] && _fail "_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 +} + +_log_writes_mount() +{ + _scratch_options mount + $MOUNT_PROG -t $FSTYP `_common_dev_mount_options $*` $SCRATCH_OPTIONS \ + $LOGWRITES_DMDEV $SCRATCH_MNT +} + +_log_writes_unmount() +{ + $UMOUNT_PROG $SCRATCH_MNT +} + +# _replay_log +# +# This replays the log contained on $LOGWRITES_DEV onto $SCRATCH_DEV upto the +# mark passed in. +_log_writes_replay_log() +{ + _mark=$1 + + $here/src/log-writes/replay-log --log $LOGWRITES_DEV --replay $SCRATCH_DEV \ + --end-mark $_mark >> $seqres.full 2>&1 + [ $? -ne 0 ] && _fail "replay failed" +} + +_log_writes_remove() +{ + $DMSETUP_PROG remove $LOGWRITES_NAME > /dev/null 2>&1 + $DMSETUP_PROG mknodes > /dev/null 2>&1 +} + +_log_writes_cleanup() +{ + $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.