From patchwork Fri Nov 15 18:01:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 3189401 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FF899F432 for ; Fri, 15 Nov 2013 18:01:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 12B9720925 for ; Fri, 15 Nov 2013 18:01:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B85BA20878 for ; Fri, 15 Nov 2013 18:01:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869Ab3KOSB2 (ORCPT ); Fri, 15 Nov 2013 13:01:28 -0500 Received: from dkim2.fusionio.com ([66.114.96.54]:51607 "EHLO dkim2.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619Ab3KOSBK (ORCPT ); Fri, 15 Nov 2013 13:01:10 -0500 Received: from mx2.fusionio.com (unknown [10.101.1.160]) by dkim2.fusionio.com (Postfix) with ESMTP id AF0C39A0371 for ; Fri, 15 Nov 2013 11:01:09 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1384538469; bh=iKsDktXwRj8INhPb0RheQ52HR+jjRLUheYJT7MJQ8qE=; h=From:To:Subject:Date:In-Reply-To:References; b=O9puExcUCz9sAYSGvse6tbEiOrO5y3EivyIWWYzKB/ngltUryXdyu5mSMulDMXEqn DVimE7t7KYsEEvIZMYXQ/Fpf5B2N3ix/7JlIb9NnuKeIT7Xo1yjfwj12EShDknPNh1 QyLjdfr63QijqAYnoJqHG1OdwtEwlykSXfIOcOm8= X-ASG-Debug-ID: 1384538469-0421b57ae4f00c0001-6jHSXT Received: from CAS2.int.fusionio.com (cas2.int.fusionio.com [10.101.1.41]) by mx2.fusionio.com with ESMTP id D3WWMDfKYr8sfKGM (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Fri, 15 Nov 2013 11:01:09 -0700 (MST) X-Barracuda-Envelope-From: JBacik@fusionio.com Received: from localhost (10.101.1.160) by mail.fusionio.com (10.101.1.41) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 15 Nov 2013 11:01:08 -0700 From: Josef Bacik To: , Subject: [PATCH 2/2] xfstests: add a rename fsync test Date: Fri, 15 Nov 2013 13:01:04 -0500 X-ASG-Orig-Subj: [PATCH 2/2] xfstests: add a rename fsync test Message-ID: <1384538464-7384-2-git-send-email-jbacik@fusionio.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384538464-7384-1-git-send-email-jbacik@fusionio.com> References: <1384538464-7384-1-git-send-email-jbacik@fusionio.com> MIME-Version: 1.0 X-Originating-IP: [10.101.1.160] X-Barracuda-Connect: cas2.int.fusionio.com[10.101.1.41] X-Barracuda-Start-Time: 1384538469 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://10.101.1.181:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at fusionio.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.142341 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Btrfs was screwing up rename+fsync, add some regression tests for the various scenarios it was screwing up. Thanks, Signed-off-by: Josef Bacik --- tests/generic/322 | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/322.out | 7 ++++ tests/generic/group | 1 + 3 files changed, 119 insertions(+) create mode 100644 tests/generic/322 create mode 100644 tests/generic/322.out diff --git a/tests/generic/322 b/tests/generic/322 new file mode 100644 index 0000000..1cea133 --- /dev/null +++ b/tests/generic/322 @@ -0,0 +1,111 @@ +#! /bin/bash +# FS QA Test No. 322 +# +# Runs various rename fsync tests to cover some rename fsync corner cases. +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 Fusion IO. 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 +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_flakey +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/dmflakey + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_need_to_be_root +_require_scratch +_require_dm_flakey + +rm -f $seqres.full + +_clean_working_dir() +{ + _mount_flakey + rm -rf $SCRATCH_MNT/* + _unmount_flakey +} + +# Btrfs wasn't making sure the new file after rename survived the fsync +_rename_test() +{ + echo "fsync rename test" + _mount_flakey + $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCRATCH_MNT/foo \ + > $seqres.full 2>&1 || _fail "xfs_io failed" + mv $SCRATCH_MNT/foo $SCRATCH_MNT/bar + $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar + _load_flakey_table $FLAKEY_DROP_WRITES + md5sum $SCRATCH_MNT/bar + _unmount_flakey + + _load_flakey_table $FLAKEY_ALLOW_WRITES + _mount_flakey + md5sum $SCRATCH_MNT/bar + _unmount_flakey + _check_scratch_fs $FLAKEY_DEV + [ $? -ne 0 ] && _fatal "fsck failed" +} + +# Btrfs was dropping some of the modified extents in between fsyncs if we +# renamed. +_write_after_fsync_rename_test() +{ + echo "fsync rename test" + _mount_flakey + $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" -c "pwrite 2M 1M" \ + -c "sync_range -b" $SCRATCH_MNT/foo > $seqres.full 2>&1 || _fail "xfs_io failed" + mv $SCRATCH_MNT/foo $SCRATCH_MNT/bar + $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar + _load_flakey_table $FLAKEY_DROP_WRITES + md5sum $SCRATCH_MNT/bar + _unmount_flakey + + _load_flakey_table $FLAKEY_ALLOW_WRITES + _mount_flakey + md5sum $SCRATCH_MNT/bar + _unmount_flakey + _check_scratch_fs $FLAKEY_DEV + [ $? -ne 0 ] && _fatal "fsck failed" +} + +_scratch_mkfs >> $seqres.full 2>&1 + +# Create a basic flakey device that will never error out +_init_flakey + +_rename_test +_clean_working_dir +_write_after_fsync_rename_test + +status=0 +exit diff --git a/tests/generic/322.out b/tests/generic/322.out new file mode 100644 index 0000000..0d9f274 --- /dev/null +++ b/tests/generic/322.out @@ -0,0 +1,7 @@ +QA output created by 322 +fsync rename test +ca539970d4b1fa1f34213ba675007381 /mnt/scratch/bar +ca539970d4b1fa1f34213ba675007381 /mnt/scratch/bar +fsync rename test +d34ff04c17ef7068d78d0c4be49cfe57 /mnt/scratch/bar +d34ff04c17ef7068d78d0c4be49cfe57 /mnt/scratch/bar diff --git a/tests/generic/group b/tests/generic/group index 25dddd8..f492461 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -124,3 +124,4 @@ 319 acl auto quick 320 auto rw 321 auto quick metadata log +322 auto quick metadata log