From patchwork Sat Jul 2 20:19:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 9225039 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 03B5C604DB for ; Tue, 12 Jul 2016 10:37:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E819A27C39 for ; Tue, 12 Jul 2016 10:37:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBFA427F89; Tue, 12 Jul 2016 10:37:07 +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 64E3627E78 for ; Tue, 12 Jul 2016 10:37:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932286AbcGLKhE (ORCPT ); Tue, 12 Jul 2016 06:37:04 -0400 Received: from mail.kernel.org ([198.145.29.136]:55294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbcGLKhD (ORCPT ); Tue, 12 Jul 2016 06:37:03 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD9D120225; Tue, 12 Jul 2016 10:37:01 +0000 (UTC) Received: from debian3.lan (bl12-226-64.dsl.telepac.pt [85.245.226.64]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C159220222; Tue, 12 Jul 2016 10:36:59 +0000 (UTC) From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH v2 3/3] btrfs: test that send does not issue invalid rmdir operations Date: Sat, 2 Jul 2016 21:19:17 +0100 Message-Id: <1467490757-2927-1-git-send-email-fdmanana@kernel.org> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1467462808-14609-1-git-send-email-fdmanana@kernel.org> References: <1467462808-14609-1-git-send-email-fdmanana@kernel.org> 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 prematurely issues rmdir operations under a particular scenario (the rmdir operation is sent before the target directory is empty). This issue is fixed by the following patch for the linux kernel: "Btrfs: incremental send, fix premature rmdir operations" Signed-off-by: Filipe Manana --- V2: Added missing _require_test and "cd /" to the _cleanup function. tests/btrfs/126 | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/126.out | 2 + tests/btrfs/group | 1 + 3 files changed, 128 insertions(+) create mode 100755 tests/btrfs/126 create mode 100644 tests/btrfs/126.out diff --git a/tests/btrfs/126 b/tests/btrfs/126 new file mode 100755 index 0000000..772df9e --- /dev/null +++ b/tests/btrfs/126 @@ -0,0 +1,125 @@ +#! /bin/bash +# FS QA Test No. btrfs/126 +# +# Test that an incremental send operation does not prematurely issues rmdir +# operations under a particular scenario (the rmdir operation is sent before +# the target directory is empty). +# +#----------------------------------------------------------------------- +# 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_scratch +_require_test +_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/a +mkdir $SCRATCH_MNT/tmp +mkdir $SCRATCH_MNT/del +mv $SCRATCH_MNT/tmp $SCRATCH_MNT/del +mkdir $SCRATCH_MNT/a/c +mkdir $SCRATCH_MNT/del/x + +# Filesystem looks like: +# +# . (ino 256) +# |--- a/ (ino 257) +# | |--- c/ (ino 260) +# | +# |--- del/ (ino 259) +# |--- tmp/ (ino 258) +# |--- x/ (ino 261) +# +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 + +# When inode 260 was processed, rename operations for it and for inode 258 were +# issued (the rename for inode 260 must happen before the rename for inode 258). +# Then immediately after issuing the rename operation for inode 258, and before +# inode 261 was processed, the send stream issued a rmdir operation for inode +# 260, which would make the receiver fail with the error ENOTEMPTY because inode +# 261 was not yet renamed, it was still a child of inode 260 at that time. +# +mv $SCRATCH_MNT/a/c $SCRATCH_MNT +mv $SCRATCH_MNT/del/x $SCRATCH_MNT/a +mv $SCRATCH_MNT/del/tmp $SCRATCH_MNT/c +rmdir $SCRATCH_MNT/del + +# Filesystem now looks like: +# +# . (ino 256) +# |--- a/ (ino 257) +# | |--- x/ (ino 261) +# | +# |--- c/ (ino 260) +# |--- tmp/ (ino 258) +# +_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/126.out b/tests/btrfs/126.out new file mode 100644 index 0000000..dcab9e3 --- /dev/null +++ b/tests/btrfs/126.out @@ -0,0 +1,2 @@ +QA output created by 126 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 82443f6..b134caa 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -128,3 +128,4 @@ 123 auto quick qgroup 124 auto quick send 125 auto quick send +126 auto quick send