From patchwork Thu Jan 12 03:13:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 9525613 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 4F2DA6045A for ; Thu, 19 Jan 2017 12:10:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EA7128480 for ; Thu, 19 Jan 2017 12:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 335B928511; Thu, 19 Jan 2017 12:10:16 +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=-3.5 required=2.0 tests=BAYES_00, DATE_IN_PAST_96_XX, RCVD_IN_DNSWL_HI autolearn=unavailable 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 AB7FC28496 for ; Thu, 19 Jan 2017 12:10:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbdASMKN (ORCPT ); Thu, 19 Jan 2017 07:10:13 -0500 Received: from mail.kernel.org ([198.145.29.136]:38520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752523AbdASMKM (ORCPT ); Thu, 19 Jan 2017 07:10:12 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B251A2034F; Thu, 19 Jan 2017 12:10:00 +0000 (UTC) Received: from debian3.lan (bl12-226-64.dsl.telepac.pt [85.245.226.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97B18202E9; Thu, 19 Jan 2017 12:09:58 +0000 (UTC) From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana , Robbie Ko Subject: [PATCH v4 1/3] fstests: test btrfs incremental send after replacing a top level inode Date: Thu, 12 Jan 2017 03:13:13 +0000 Message-Id: <1484190793-17277-1-git-send-email-fdmanana@kernel.org> X-Mailer: git-send-email 2.7.0.rc3 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Filipe Manana Test that an incremental send operation does not fail when a new inode replaces an old inode that has the same number but different generation, and both are direct children of the subvolume/snapshot root. This is fixed by the following patch for the linux kernel: "Btrfs: send, fix failure to rename top level inode due to name collision" Signed-off-by: Robbie Ko Signed-off-by: Filipe Manana --- v4: Improved changelog and added comments to the test that explain what is being tested and the problem. tests/btrfs/133 | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/133.out | 8 ++++ tests/btrfs/group | 1 + 3 files changed, 136 insertions(+) create mode 100755 tests/btrfs/133 create mode 100644 tests/btrfs/133.out diff --git a/tests/btrfs/133 b/tests/btrfs/133 new file mode 100755 index 0000000..5839f17 --- /dev/null +++ b/tests/btrfs/133 @@ -0,0 +1,127 @@ +#! /bin/bash +# FS QA Test No. btrfs/133 +# +# Test that an incremental send operation does not fail when a new inode +# replaces an old inode that has the same number but different generation, +# and both are direct children of the subvolume/snapshot root. +# +#----------------------------------------------------------------------- +# Copyright (C) 2017 Synology Inc. All Rights Reserved. +# Author: Robbie Ko +# +# 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() +{ + cd / + rm -fr $send_files_dir + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_test +_require_scratch +_require_fssum + +send_files_dir=$TEST_DIR/btrfs-test-$seq + +rm -f $seqres.full +rm -fr $send_files_dir +mkdir $send_files_dir + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +mkdir $SCRATCH_MNT/a1 +mkdir $SCRATCH_MNT/a2 + +# Filesystem looks like: +# +# . (ino 256) +# |--- a1/ (ino 257) +# |--- a2/ (ino 258) +# +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \ + $SCRATCH_MNT/mysnap1 > /dev/null + +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \ + $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch + +_scratch_unmount +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount +touch $SCRATCH_MNT/a2 + +# Filesystem now looks like: +# +# . (ino 256) +# |--- a2 (ino 257) +# +# Notice that at this point inode 257 has a generation with value 7, which is +# the generation value for a brand new filesystem. + +# Now create the second snapshot. This makes the filesystem's current generation +# value to increase to the value 8, due to a transaction commit performed by the +# snapshot creation ioctl. +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \ + $SCRATCH_MNT/mysnap2 > /dev/null + +# Now receive the first snapshot created in the first filesystem. +# Before creating any inodes, the receive command creates the first snapshot, +# which causes a transaction commit and therefore bumps the filesystem's current +# generation to the value 9. All the inodes created end up getting a generation +# value of 9 and the snapshot's root inode (256) gets a generation value of 8. +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null +rm $send_files_dir/1.snap + +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 + +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \ + $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \ + -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch + +# Now recreate the filesystem by receiving both send streams and verify we get +# the same content that the original filesystem had. +# The receive for the second snapshot used to fail because the send stream had +# an operation to rename the new inode 257 (generation 7) from its orphan name +# to its final name (a2) before the operation to delete (rmdir) the inode 258. +_scratch_unmount +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 + +status=0 +exit diff --git a/tests/btrfs/133.out b/tests/btrfs/133.out new file mode 100644 index 0000000..97f29b1 --- /dev/null +++ b/tests/btrfs/133.out @@ -0,0 +1,8 @@ +QA output created by 133 +At subvol SCRATCH_MNT/mysnap1 +At subvol mysnap1 +At subvol SCRATCH_MNT/mysnap1 +At subvol SCRATCH_MNT/mysnap2 +At subvol mysnap1 +OK +OK diff --git a/tests/btrfs/group b/tests/btrfs/group index 3fbf706..0cdd413 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -134,3 +134,4 @@ 130 auto clone send 131 auto quick 132 auto enospc +133 auto quick send