From patchwork Tue Sep 1 13:47:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Foster X-Patchwork-Id: 11748171 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD7F813B6 for ; Tue, 1 Sep 2020 13:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4F41207D3 for ; Tue, 1 Sep 2020 13:48:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AY1inSel" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728241AbgIANr6 (ORCPT ); Tue, 1 Sep 2020 09:47:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34300 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728257AbgIANro (ORCPT ); Tue, 1 Sep 2020 09:47:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598968052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NHE/nZbwiOoblJJMtTZR2g1xUXRlA7Vnz3roC9Mkkck=; b=AY1inSelnZZ26/9Cg+ybU3jFzo7Lqtifkp3syliLF49WbTbG8Vdzrlvf/D7iTi4vxyWIc6 rWKmrJEfEPMJyYXfmKu8sF5PeNSG2aghZjB66++Q/CUSQgDQrXVcvrZHJy0JIwt9xKbTSX OPZIlbyzK5aNn7Yu24egDuZFyNht3KI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-173-_eHR8xQtNzKdHCHsmy6hmg-1; Tue, 01 Sep 2020 09:47:30 -0400 X-MC-Unique: _eHR8xQtNzKdHCHsmy6hmg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CAE4C1007B01; Tue, 1 Sep 2020 13:47:29 +0000 (UTC) Received: from bfoster.redhat.com (ovpn-113-130.rdu2.redhat.com [10.10.113.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C0DE7DA53; Tue, 1 Sep 2020 13:47:29 +0000 (UTC) From: Brian Foster To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org Subject: [PATCH v3 2/3] generic/457: use thin volume for dmlogwrites target device Date: Tue, 1 Sep 2020 09:47:27 -0400 Message-Id: <20200901134728.185353-3-bfoster@redhat.com> In-Reply-To: <20200901134728.185353-1-bfoster@redhat.com> References: <20200901134728.185353-1-bfoster@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org dmlogwrites support for XFS depends on discard zeroing support of the intended target device. Update the test to use a thin volume and allow it to run consistently and reliably on XFS. Signed-off-by: Brian Foster Reviewed-by: Amir Goldstein --- tests/generic/457 | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/tests/generic/457 b/tests/generic/457 index 82367304..42a064d8 100755 --- a/tests/generic/457 +++ b/tests/generic/457 @@ -16,6 +16,7 @@ status=1 # failure is the default! _cleanup() { _log_writes_cleanup + _dmthin_cleanup } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -23,6 +24,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common/rc . ./common/filter . ./common/reflink +. ./common/dmthin . ./common/dmlogwrites # real QA test starts here @@ -32,6 +34,7 @@ _require_test _require_scratch_reflink _require_cp_reflink _require_log_writes +_require_dm_target thin-pool rm -f $seqres.full @@ -44,13 +47,12 @@ check_files() local filename=$(basename $i) local mark="${filename##*.}" echo "checking $filename" >> $seqres.full - _log_writes_replay_log $filename $SCRATCH_DEV - _scratch_mount + _log_writes_replay_log $filename $DMTHIN_VOL_DEV + _dmthin_mount local expected_md5=$(_md5_checksum $i) local md5=$(_md5_checksum $SCRATCH_MNT/$name) [ "${md5}" != "${expected_md5}" ] && _fail "$filename md5sum mismatched" - _scratch_unmount - _check_scratch_fs + _dmthin_check_fs done } @@ -58,8 +60,16 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR +devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +csize=$((1024*64 / 512)) # 64k cluster size +lowspace=$((1024*1024 / 512)) # 1m low space threshold + +# Use a thin device to provide deterministic discard behavior. Discards are used +# by the log replay tool for fast zeroing to prevent out-of-order replay issues. +_dmthin_init $devsize $devsize $csize $lowspace + # Create the log -_log_writes_init $SCRATCH_DEV +_log_writes_init $DMTHIN_VOL_DEV _log_writes_mkfs >> $seqres.full 2>&1 @@ -92,14 +102,13 @@ _log_writes_mark last _log_writes_unmount _log_writes_mark end _log_writes_remove -_check_scratch_fs +_dmthin_check_fs # check pre umount echo "checking pre umount" >> $seqres.full -_log_writes_replay_log last $SCRATCH_DEV -_scratch_mount -_scratch_unmount -_check_scratch_fs +_log_writes_replay_log last $DMTHIN_VOL_DEV +_dmthin_mount +_dmthin_check_fs for j in `seq 0 $((NUM_FILES-1))`; do check_files testfile$j @@ -107,8 +116,8 @@ done # Check the end echo "checking post umount" >> $seqres.full -_log_writes_replay_log end $SCRATCH_DEV -_scratch_mount +_log_writes_replay_log end $DMTHIN_VOL_DEV +_dmthin_mount for j in `seq 0 $((NUM_FILES-1))`; do md5=$(_md5_checksum $SCRATCH_MNT/testfile$j) [ "${md5}" != "${test_md5[$j]}" ] && _fail "testfile$j end md5sum mismatched"