From patchwork Fri Oct 28 01:44:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: robbieko X-Patchwork-Id: 9400767 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 9A288606DB for ; Fri, 28 Oct 2016 01:50:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A8682A42F for ; Fri, 28 Oct 2016 01:50:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EA7C2A431; Fri, 28 Oct 2016 01:50:05 +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=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 0BA812A430 for ; Fri, 28 Oct 2016 01:50:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034073AbcJ1BuE (ORCPT ); Thu, 27 Oct 2016 21:50:04 -0400 Received: from synology.com ([59.124.61.242]:38196 "EHLO synology.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965646AbcJ1BuD (ORCPT ); Thu, 27 Oct 2016 21:50:03 -0400 Received: from localhost.localdomain (unknown [10.12.12.46]) (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 026AE132B00F8; Fri, 28 Oct 2016 09:44:12 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1477619053; bh=VYNAnC9IVOJ4ClQi37LaGd9raMXwiZuq+QyoApvddO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=alzIZLTxOSOzu8zdlDMCsXM7k/Mc/Re3Fi0ngS9VjNCttgP7gJ1WgEjfy2UDAAzm5 N4zZ+D4Tjjra/nYjz5eDifdMu3HDhHhm6FNMSGPzP8nZx4auE/pjgKtiMoIo25Kgbi a7l2wAcHFFPix4jc3tF83tjjE/2w8PLF6V0VwI1w= From: robbieko To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Robbie Ko Subject: [PATCH v2 3/4] xfstests: btrfs/133: add test for incremental send with rmdir applied on wrong name Date: Fri, 28 Oct 2016 09:44:05 +0800 Message-Id: <1477619046-16375-4-git-send-email-robbieko@synology.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477619046-16375-1-git-send-email-robbieko@synology.com> References: <1477619046-16375-1-git-send-email-robbieko@synology.com> X-MailScanner-ID: 026AE132B00F8.A464C 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=-2.79, required 4.5, ALL_TRUSTED -1.00, BAYES_00 -1.90, DKIM_SIGNED 0.10, T_DKIM_INVALID 0.01) X-MailScanner-From: robbieko@synology.com Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robbie Ko Test that an incremental send operation doesn't work for rmdir because it uses the wrong name to delete. This test exercises scenarios used to fail in btrfs and are fixed by the following patch for the linux kernel: "Btrfs: incremental send, skip check overwritten if parents' generation are different" Signed-off-by: Robbie Ko --- tests/btrfs/133 | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/133.out | 2 + tests/btrfs/group | 1 + 3 files changed, 122 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..e516483 --- /dev/null +++ b/tests/btrfs/133 @@ -0,0 +1,119 @@ +#! /bin/bash +# FS QA Test No. btrfs/133 +# +# Test that an incremental send operation doesn't work for rmdir +# because it uses the wrong name to delete. +# +#----------------------------------------------------------------------- +# 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 + +touch $SCRATCH_MNT/f +mkdir $SCRATCH_MNT/d1 +mkdir $SCRATCH_MNT/d259_old +mv $SCRATCH_MNT/d1 $SCRATCH_MNT/d259_old/d1 + +# Filesystem looks like: +# +# . (ino 256) +# |--- f (ino 257) +# | +# |--- d259_old/ (ino 259) +# | |--- d1/ (ino 258) +# +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 + +_run_btrfs_util_prog send $SCRATCH_MNT/mysnap1 -f $send_files_dir/1.snap + +_scratch_unmount +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount +mkdir $SCRATCH_MNT/d1 +mkdir $SCRATCH_MNT/dir258 +mkdir $SCRATCH_MNT/dir259 +mv $SCRATCH_MNT/d1 $SCRATCH_MNT/dir259/d1 + +# Filesystem now looks like: +# +# . (ino 256) +# |--- dir258 (ino 258) +# | +# |--- dir259/ (ino 259) +# | |--- d1/ (ino 257) +# +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/1.snap +rm $send_files_dir/1.snap + +run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 +run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 + +_run_btrfs_util_prog send $SCRATCH_MNT/mysnap1 -f $send_files_dir/1.snap +_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \ + -f $send_files_dir/2.snap + +# 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 + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/1.snap +run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 +_run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/2.snap +run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 + +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/133.out b/tests/btrfs/133.out new file mode 100644 index 0000000..e914d62 --- /dev/null +++ b/tests/btrfs/133.out @@ -0,0 +1,2 @@ +QA output created by 133 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 1b12382..779caec 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -135,3 +135,4 @@ 130 auto clone send 131 auto quick send 132 auto quick send +133 auto quick send