From patchwork Thu Oct 13 11:04:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: robbieko X-Patchwork-Id: 9374781 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 093356075E for ; Thu, 13 Oct 2016 11:05:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEDE229FCF for ; Thu, 13 Oct 2016 11:05:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1A0429FD1; Thu, 13 Oct 2016 11:05:10 +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 33FE729FCF for ; Thu, 13 Oct 2016 11:05:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754144AbcJMLFE (ORCPT ); Thu, 13 Oct 2016 07:05:04 -0400 Received: from synology.com ([59.124.61.242]:45423 "EHLO synology.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029AbcJMLE7 (ORCPT ); Thu, 13 Oct 2016 07:04:59 -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 3A646F78D4E6; Thu, 13 Oct 2016 19:04:28 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1476356668; bh=kLoUp4u+HhW+4gfZPBMmBHTGRqGL02SIQE9ygfGd3/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XEoG++VP4sAqMppSQ+Ajr1wE9mH+2ddDUfPo/ZZ7g9C9p6AsyWpNHMK5FfK91BUAO BVQmSXpFS2lXEgZhNaLXCrKe+dYbeAHL0yH+7IOJ0Fsx7jdcesf20DYEC2DPwsT8NJ jUGWT0A1BVDBgXx8uuGtq1gD16BJ1HxbYd5tLATg= From: robbieko To: linux-btrfs@vger.kernel.org Cc: Robbie Ko Subject: [PATCH 2/4] btrfs: add test for an incremental send add gen for is_waiting_for_rm when some corner case Date: Thu, 13 Oct 2016 19:04:11 +0800 Message-Id: <1476356653-22839-3-git-send-email-robbieko@synology.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476356653-22839-1-git-send-email-robbieko@synology.com> References: <1476356653-22839-1-git-send-email-robbieko@synology.com> X-MailScanner-ID: 3A646F78D4E6.AA40B 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: 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 There a one case for old_gen waiting_for_rm, but new_gen use get_cur_path with the same inode. This test exercises scenarios used to fail in btrfs and are fixed by the following patches for the linux kernel: "Btrfs: incremental send, add gen for is_waiting_for_rm when some corner case" "Btrfs: incremental send, add gen for send_utimes in apply_dir_move" Signed-off-by: Robbie Ko --- tests/btrfs/132 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/132.out | 2 + tests/btrfs/group | 1 + 3 files changed, 119 insertions(+) create mode 100755 tests/btrfs/132 create mode 100644 tests/btrfs/132.out diff --git a/tests/btrfs/132 b/tests/btrfs/132 new file mode 100755 index 0000000..1ecd3b5 --- /dev/null +++ b/tests/btrfs/132 @@ -0,0 +1,116 @@ +#! /bin/bash +# FS QA Test No. btrfs/132 +# +# Test that an incremental send operation, +# add gen for is_waiting_for_rm when some corner case. +# +#----------------------------------------------------------------------- +# 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() +{ + 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/dir257 +mkdir $SCRATCH_MNT/dir258 +mkdir $SCRATCH_MNT/dir259 +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/dir258/dir257 + +# Filesystem looks like: +# +# . (ino 256) +# |--- dir258/ (ino 258) +# | |--- dir257/ (ino 257) +# | +# |--- dir259/ (ino 259) +# +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 + +mv $SCRATCH_MNT/dir258/dir257 $SCRATCH_MNT/dir257 +rmdir $SCRATCH_MNT/dir258 +rmdir $SCRATCH_MNT/dir259 +_scratch_unmount +_scratch_mount +touch $SCRATCH_MNT/file258 +mkdir $SCRATCH_MNT/new_dir259 +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/new_dir259/dir257 + +# Filesystem now looks like: +# +# . (ino 256) +# |--- file258 (ino 258) +# | +# |--- new_dir259/ (ino 259) +# | |--- dir257/ (ino 257) +# +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 + +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 \ + -x $SCRATCH_MNT/mysnap2/mysnap1 $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/132.out b/tests/btrfs/132.out new file mode 100644 index 0000000..b096312 --- /dev/null +++ b/tests/btrfs/132.out @@ -0,0 +1,2 @@ +QA output created by 132 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index a7a070a..1b12382 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -134,3 +134,4 @@ 129 auto quick send 130 auto clone send 131 auto quick send +132 auto quick send