From patchwork Wed Jan 4 10:53:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: robbieko X-Patchwork-Id: 9496455 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 73B77606A9 for ; Wed, 4 Jan 2017 10:55:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 670FB27E33 for ; Wed, 4 Jan 2017 10:55:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A76427DF9; Wed, 4 Jan 2017 10:55:06 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 D082527DF9 for ; Wed, 4 Jan 2017 10:55:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966083AbdADKzC (ORCPT ); Wed, 4 Jan 2017 05:55:02 -0500 Received: from synology.com ([59.124.61.242]:35518 "EHLO synology.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965857AbdADKzA (ORCPT ); Wed, 4 Jan 2017 05:55:00 -0500 Received: from localhost.localdomain (125-227-147-112.HINET-IP.hinet.net [125.227.147.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: robbieko@synology.com) by synology.com (Postfix) with ESMTPSA id 48D83666E8E; Wed, 4 Jan 2017 18:53:56 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1483527236; bh=DvmKqEIwLcBRHUg5wwe2TuNXlIwpTOeTckV3xJgsso4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=E2fZPtI/7+IAJIJOI4RBv+PBWsqHWC2SGIGVqroqe8vBGxva8qn+JU/NAEqTcqYa4 Q6ASy5P3JKtPRrUnOo5Y2C4cqc5M2ecOW/vZbr81ermf3JBHHVXaAcStwxH89mrE/N 5+EnErwE5xiBKKX+PGZquagY5IJQ81i4jS2Xaamw= From: robbieko To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Robbie Ko Subject: [PATCH v3 1/4] xfstests: btrfs/131: add test for an incremental send with name collision Date: Wed, 4 Jan 2017 18:53:27 +0800 Message-Id: <1483527210-2530-2-git-send-email-robbieko@synology.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483527210-2530-1-git-send-email-robbieko@synology.com> References: <1483527210-2530-1-git-send-email-robbieko@synology.com> X-MailScanner-ID: 48D83666E8E.AD1AB X-MailScanner: Found to be clean X-MailScanner-MCPCheck: MCP-Clean, MCP-Checker (score=0, required 80) X-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (not cached, score=-0.889, required 4.5, ALL_TRUSTED -1.00, DKIM_SIGNED 0.10, T_DKIM_INVALID 0.01, URIBL_BLOCKED 0.00) X-MailScanner-From: robbieko@synology.com 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: Robbie Ko Test that an incremental send operation doesn't work because there's a name collision in the destination and it's not checked corretly before the rename operation applies. This test exercises scenarios used to fail in btrfs and are fixed by the following patch for the linux kernel: "Btrfs: incremental send, do not skip generation inconsistency check for inode 256." Signed-off-by: Robbie Ko --- V3: remove "run_" based helpers V2: improve the change log tests/btrfs/131 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/131.out | 9 ++++ tests/btrfs/group | 1 + 3 files changed, 125 insertions(+) create mode 100755 tests/btrfs/131 create mode 100644 tests/btrfs/131.out diff --git a/tests/btrfs/131 b/tests/btrfs/131 new file mode 100755 index 0000000..ed01662 --- /dev/null +++ b/tests/btrfs/131 @@ -0,0 +1,115 @@ +#! /bin/bash +# FS QA Test No. btrfs/131 +# +# Test that an incremental send operation doesn't work because +# there's a name collision in the destination and it's not checked +# corretly before the rename operation applies. +# +#----------------------------------------------------------------------- +# Copyright (C) 2016 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) +# +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \ + $SCRATCH_MNT/mysnap2 > /dev/null + +$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. +_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 + +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/131.out b/tests/btrfs/131.out new file mode 100644 index 0000000..3bea480 --- /dev/null +++ b/tests/btrfs/131.out @@ -0,0 +1,9 @@ +QA output created by 131 +At subvol SCRATCH_MNT/mysnap1 +At subvol mysnap1 +At subvol SCRATCH_MNT/mysnap1 +At subvol SCRATCH_MNT/mysnap2 +At subvol mysnap1 +OK +OK +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index f3a7a4f..a7a070a 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -133,3 +133,4 @@ 128 auto quick send 129 auto quick send 130 auto clone send +131 auto quick send