From patchwork Thu Mar 13 12:09:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3825761 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 912BC9F1CD for ; Thu, 13 Mar 2014 12:10:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83BC8201E9 for ; Thu, 13 Mar 2014 12:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69F4820176 for ; Thu, 13 Mar 2014 12:10:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115AbaCMMKW (ORCPT ); Thu, 13 Mar 2014 08:10:22 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:45028 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753652AbaCMMKU (ORCPT ); Thu, 13 Mar 2014 08:10:20 -0400 Received: by mail-we0-f178.google.com with SMTP id u56so762292wes.9 for ; Thu, 13 Mar 2014 05:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DTGLuotjq4AsO9ILVy4GqDWRfm2+gtl2IOEgoL0pOP0=; b=d0v61Dax25E7AaG4Uq80J4FzSLNQSVP5hPFtVGkiWifNUDS0yhTB75WqnRzjn0aXcq qQKrMO1oLDL+BfJcmdSnTR2XUnkCr+3pkD7QvdZ+H402L2TWxwTJ5iTubJcKyt7or6w3 ngsaWpNIBPWRbiLYAWp0trBuWC9P4KhckD046qkGuouS0Ss2P3GdrfYOW41i+jOADjq3 GyZSB9PZybuIEpZHzgHcivo4usxD70lV4trxpbRkwQn3eeLAtSNmPi/YfsRMxftSyQ9Z U63SsXWfKG/VYDZTNGUZUFoXkIaWBL8utehtaBIpmWRlAdQXUpcG9lY+zKKNRQr9kDkl ELVA== X-Received: by 10.180.77.200 with SMTP id u8mr1359665wiw.48.1394712619024; Thu, 13 Mar 2014 05:10:19 -0700 (PDT) Received: from debian-vm3.lan (bl10-252-34.dsl.telepac.pt. [85.243.252.34]) by mx.google.com with ESMTPSA id hy8sm5194972wjb.2.2014.03.13.05.10.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 05:10:18 -0700 (PDT) From: Filipe David Borba Manana To: xfs@oss.sgi.com Cc: linux-btrfs@vger.kernel.org, jbacik@fb.com, Filipe David Borba Manana Subject: [PATCH RESEND] xfstests: add test for btrfs send issuing premature rmdir operations Date: Thu, 13 Mar 2014 12:09:53 +0000 Message-Id: <1394712593-9212-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Regression test for btrfs incremental send issue where a rmdir instruction is sent against an orphan directory inode which is not empty yet, causing btrfs receive to fail when it attempts to remove the directory. This issue is fixed by the following linux kernel btrfs patch: Btrfs: fix send attempting to rmdir non-empty directories Signed-off-by: Filipe David Borba Manana Reviewed-by: Josef Bacik --- Resending since Dave Chinner asked to do it for any patches he might have missed in his last merge. tests/btrfs/043 | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/043.out | 1 + tests/btrfs/group | 1 + 3 files changed, 151 insertions(+) create mode 100644 tests/btrfs/043 create mode 100644 tests/btrfs/043.out diff --git a/tests/btrfs/043 b/tests/btrfs/043 new file mode 100644 index 0000000..b1fef96 --- /dev/null +++ b/tests/btrfs/043 @@ -0,0 +1,149 @@ +#! /bin/bash +# FS QA Test No. btrfs/043 +# +# Regression test for btrfs incremental send issue where a rmdir instruction +# is sent against an orphan directory inode which is not empty yet, causing +# btrfs receive to fail when it attempts to remove the directory. +# +# This issue is fixed by the following linux kernel btrfs patch: +# +# Btrfs: fix send attempting to rmdir non-empty directories +# +#----------------------------------------------------------------------- +# Copyright (c) 2014 Filipe Manana. All Rights Reserved. +# +# 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=`mktemp -d` +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + rm -fr $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_fssum +_need_to_be_root + +rm -f $seqres.full + +_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +mkdir -p $SCRATCH_MNT/a/b +mkdir $SCRATCH_MNT/0 +mkdir $SCRATCH_MNT/1 +mkdir $SCRATCH_MNT/a/b/c +mv $SCRATCH_MNT/0 $SCRATCH_MNT/a/b/c +mv $SCRATCH_MNT/1 $SCRATCH_MNT/a/b/c +echo 'ola mundo' > $SCRATCH_MNT/a/b/c/foo.txt +mkdir $SCRATCH_MNT/a/b/c/x +mkdir $SCRATCH_MNT/a/b/c/x2 +mkdir $SCRATCH_MNT/a/b/y +mkdir $SCRATCH_MNT/a/b/z +mkdir -p $SCRATCH_MNT/a/b/d1/d2/d3 +mkdir $SCRATCH_MNT/a/b/d4 + +# Filesystem looks like: +# +# . (ino 256) +# |-- a/ (ino 257) +# |-- b/ (ino 258) +# |-- c/ (ino 261) +# | |-- foo.txt (ino 262) +# | |-- 0/ (ino 259) +# | |-- 1/ (ino 260) +# | |-- x/ (ino 263) +# | |-- x2/ (ino 264) +# | +# |-- y/ (ino 265) +# |-- z/ (ino 266) +# |-- d1/ (ino 267) +# | |-- d2/ (ino 268) +# | |-- d3/ (ino 269) +# | +# |-- d4/ (ino 270) + +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 + +rm -f $SCRATCH_MNT/a/b/c/foo.txt +mv $SCRATCH_MNT/a/b/y $SCRATCH_MNT/a/b/YY +mv $SCRATCH_MNT/a/b/z $SCRATCH_MNT/a +mv $SCRATCH_MNT/a/b/c/x $SCRATCH_MNT/a/b/YY +mv $SCRATCH_MNT/a/b/c/0 $SCRATCH_MNT/a/b/YY/00 +mv $SCRATCH_MNT/a/b/c/x2 $SCRATCH_MNT/a/z/X_2 +mv $SCRATCH_MNT/a/b/c/1 $SCRATCH_MNT/a/z/X_2 +rmdir $SCRATCH_MNT/a/b/c +mv $SCRATCH_MNT/a/b/d4 $SCRATCH_MNT/a/d44 +mv $SCRATCH_MNT/a/b/d1/d2 $SCRATCH_MNT/a/d44 +rmdir $SCRATCH_MNT/a/b/d1 + +# Filesystem now looks like: +# +# . (ino 256) +# |-- a/ (ino 257) +# |-- b/ (ino 258) +# | |-- YY/ (ino 265) +# | |-- x/ (ino 263) +# | |-- 00/ (ino 259) +# | +# |-- z/ (ino 266) +# | |-- X_2/ (ino 264) +# | |-- 1/ (ino 260) +# | +# |-- d44/ (ino 270) +# |-- d2/ (ino 268) +# |-- d3/ (ino 269) + +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 + +run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 +run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ + $SCRATCH_MNT/mysnap2 + +_run_btrfs_util_prog send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap +_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \ + -f $tmp/2.snap + +_check_scratch_fs + +_scratch_unmount +_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/1.snap +run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap +run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 + +_check_scratch_fs + +status=0 +exit diff --git a/tests/btrfs/043.out b/tests/btrfs/043.out new file mode 100644 index 0000000..7851fbe --- /dev/null +++ b/tests/btrfs/043.out @@ -0,0 +1 @@ +QA output created by 043 diff --git a/tests/btrfs/group b/tests/btrfs/group index 1037761..fabe3b5 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -45,3 +45,4 @@ 040 auto quick 041 auto quick 042 auto quick +043 auto quick