From patchwork Thu Mar 24 20:08:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 8670671 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2785C0553 for ; Fri, 25 Mar 2016 12:35:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E64582035B for ; Fri, 25 Mar 2016 12:35:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6BC9202EC for ; Fri, 25 Mar 2016 12:35:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752215AbcCYMfF (ORCPT ); Fri, 25 Mar 2016 08:35:05 -0400 Received: from mail.kernel.org ([198.145.29.136]:42621 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752078AbcCYMfE (ORCPT ); Fri, 25 Mar 2016 08:35:04 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0F68202EC; Fri, 25 Mar 2016 12:35:01 +0000 (UTC) Received: from debian3.lan (dsl-112-39.bl26.telepac.pt [176.78.112.39]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 344D7202E9; Fri, 25 Mar 2016 12:35:00 +0000 (UTC) From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH v2] fstests: add btrfs test for fsync after snapshot deletion Date: Thu, 24 Mar 2016 20:08:36 +0000 Message-Id: <1458850116-991-1-git-send-email-fdmanana@kernel.org> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1458839241-12379-1-git-send-email-fdmanana@kernel.org> References: <1458839241-12379-1-git-send-email-fdmanana@kernel.org> X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DATE_IN_PAST_12_24, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Filipe Manana Test that if we delete a snapshot, delete its parent directory, create another directory with the same name as that parent and then fsync either the new directory or a file inside the new directory, the fsync succeeds, the fsync log is replayable and produces a correct result. This is motivated by a bug that is fixed by the following patch for btrfs (linux kernel): Btrfs: fix unreplayable log after snapshot deletion and parent re-creation Signed-off-by: Filipe Manana Reviewed-by: Eryu Guan --- V2: Renamed local function _populate_fs to populate_testdir. tests/btrfs/120 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/120.out | 12 +++++++ tests/btrfs/group | 1 + 3 files changed, 104 insertions(+) create mode 100755 tests/btrfs/120 create mode 100644 tests/btrfs/120.out diff --git a/tests/btrfs/120 b/tests/btrfs/120 new file mode 100755 index 0000000..329b45c --- /dev/null +++ b/tests/btrfs/120 @@ -0,0 +1,91 @@ +#! /bin/bash +# FSQA Test No. 120 +# +# Test that if we delete a snapshot, delete its parent directory, create +# another directory with the same name as that parent and then fsync either +# the new directory or a file inside the new directory, the fsync succeeds, +# the fsync log is replayable and produces a correct result. +# +#----------------------------------------------------------------------- +# +# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved. +# Author: Filipe Manana +# +# 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" +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + _cleanup_flakey + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/dmflakey + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_dm_target flakey +_require_metadata_journaling $SCRATCH_DEV + +rm -f $seqres.full + +populate_testdir() +{ + _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \ + $SCRATCH_MNT/testdir/snap + _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap + rmdir $SCRATCH_MNT/testdir + mkdir $SCRATCH_MNT/testdir +} + +_scratch_mkfs >>$seqres.full 2>&1 +_init_flakey +_mount_flakey + +mkdir $SCRATCH_MNT/testdir +populate_testdir +$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir +_flakey_drop_and_remount + +echo "Filesystem contents after the first log replay:" +ls -R $SCRATCH_MNT | _filter_scratch + +# Now do the same as before but instead of doing an fsync against the directory, +# do an fsync against a file inside the directory. + +populate_testdir +touch $SCRATCH_MNT/testdir/foobar +$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir/foobar +_flakey_drop_and_remount + +echo "Filesystem contents after the second log replay:" +ls -R $SCRATCH_MNT | _filter_scratch + +_unmount_flakey +status=0 +exit diff --git a/tests/btrfs/120.out b/tests/btrfs/120.out new file mode 100644 index 0000000..4210bfa --- /dev/null +++ b/tests/btrfs/120.out @@ -0,0 +1,12 @@ +QA output created by 120 +Filesystem contents after the first log replay: +SCRATCH_MNT: +testdir + +SCRATCH_MNT/testdir: +Filesystem contents after the second log replay: +SCRATCH_MNT: +testdir + +SCRATCH_MNT/testdir: +foobar diff --git a/tests/btrfs/group b/tests/btrfs/group index d312874..13aa1e5 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -120,3 +120,4 @@ 117 auto quick send clone 118 auto quick snapshot metadata 119 auto quick snapshot metadata qgroup +120 auto quick snapshot metadata