From patchwork Thu Feb 18 23:08:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 8354831 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 CB6BBC0553 for ; Thu, 18 Feb 2016 23:09:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B8EAB20274 for ; Thu, 18 Feb 2016 23:09:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96310203C3 for ; Thu, 18 Feb 2016 23:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947480AbcBRXJN (ORCPT ); Thu, 18 Feb 2016 18:09:13 -0500 Received: from mail.kernel.org ([198.145.29.136]:35319 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947316AbcBRXJL (ORCPT ); Thu, 18 Feb 2016 18:09:11 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E318F203DC; Thu, 18 Feb 2016 23:09:09 +0000 (UTC) Received: from debian3.lan (bl8-199-62.dsl.telepac.pt [85.241.199.62]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 17B95203C3; Thu, 18 Feb 2016 23:09:07 +0000 (UTC) From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH v2] fstests: btrfs, test directory fsync after deleting snapshots Date: Thu, 18 Feb 2016 23:08:59 +0000 Message-Id: <1455836939-10028-1-git-send-email-fdmanana@kernel.org> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1455533619-7598-1-git-send-email-fdmanana@kernel.org> References: <1455533619-7598-1-git-send-email-fdmanana@kernel.org> X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, 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 fsync a directory that had a snapshot entry in it that was deleted and crash, the next time we mount the filesystem, the log replay procedure will not fail and the snapshot is not present anymore. This issue is fixed by the following patch for the linux kernel: "Btrfs: fix unreplayable log after snapshot delete + parent dir fsync" Signed-off-by: Filipe Manana Tested-by: Liu Bo Reviewed-by: Liu Bo --- V2: Removed the call to _need_to_be_root since there's a patch around to kill it. Removed explicit snapshot existence tests with bash and replaced with calls to ls -R. tests/btrfs/118 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/118.out | 15 ++++++++ tests/btrfs/group | 1 + 3 files changed, 114 insertions(+) create mode 100755 tests/btrfs/118 create mode 100644 tests/btrfs/118.out diff --git a/tests/btrfs/118 b/tests/btrfs/118 new file mode 100755 index 0000000..d0a1f2e --- /dev/null +++ b/tests/btrfs/118 @@ -0,0 +1,98 @@ +#! /bin/bash +# FSQA Test No. 118 +# +# Test that if we fsync a directory that had a snapshot entry in it that was +# deleted and crash, the next time we mount the filesystem, the log replay +# procedure will not fail and the snapshot is not present anymore. +# +#----------------------------------------------------------------------- +# +# 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 + +_scratch_mkfs >>$seqres.full 2>&1 +_init_flakey +_mount_flakey + +# Create a snapshot at the root of our filesystem (mount point path), delete it, +# fsync the mount point path, crash and mount to replay the log. This should +# succeed and after the filesystem is mounted the snapshot should not be visible +# anymore. +_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap1 +_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap1 +$XFS_IO_PROG -c "fsync" $SCRATCH_MNT + +echo "Filesystem content before first power failure:" +ls -R $SCRATCH_MNT | _filter_scratch + +_flakey_drop_and_remount + +echo "Filesystem content after first power failure:" +# Must match what we had before the power failure, we don't expect to see the +# snapshot anymore. +ls -R $SCRATCH_MNT | _filter_scratch + +# Similar scenario as above, but this time the snapshot is created inside a +# directory and not directly under the root (mount point path). +mkdir $SCRATCH_MNT/testdir +_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/testdir/snap2 +_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap2 +$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir + +echo "Filesystem content before second power failure:" +ls -R $SCRATCH_MNT | _filter_scratch + +_flakey_drop_and_remount + +echo "Filesystem content after second power failure:" +# Must match what we had before the power failure, we don't expect to see the +# snapshot anymore. +ls -R $SCRATCH_MNT | _filter_scratch + +_unmount_flakey + +status=0 +exit diff --git a/tests/btrfs/118.out b/tests/btrfs/118.out new file mode 100644 index 0000000..fee12ad --- /dev/null +++ b/tests/btrfs/118.out @@ -0,0 +1,15 @@ +QA output created by 118 +Filesystem content before first power failure: +SCRATCH_MNT: +Filesystem content after first power failure: +SCRATCH_MNT: +Filesystem content before second power failure: +SCRATCH_MNT: +testdir + +SCRATCH_MNT/testdir: +Filesystem content after second power failure: +SCRATCH_MNT: +testdir + +SCRATCH_MNT/testdir: diff --git a/tests/btrfs/group b/tests/btrfs/group index f74ffbb..a2fa412 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -118,3 +118,4 @@ 115 auto qgroup 116 auto quick metadata 117 auto quick send clone +118 auto quick snapshot metadata