From patchwork Fri Oct 18 18:26:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 3069471 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 BAB7C9F243 for ; Fri, 18 Oct 2013 18:26:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8F74F2039E for ; Fri, 18 Oct 2013 18:26:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47C562039A for ; Fri, 18 Oct 2013 18:26:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756942Ab3JRS0g (ORCPT ); Fri, 18 Oct 2013 14:26:36 -0400 Received: from dkim1.fusionio.com ([66.114.96.53]:38361 "EHLO dkim1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756931Ab3JRS0f (ORCPT ); Fri, 18 Oct 2013 14:26:35 -0400 Received: from mx1.fusionio.com (unknown [10.101.1.160]) by dkim1.fusionio.com (Postfix) with ESMTP id EEEE77C0427 for ; Fri, 18 Oct 2013 12:26:34 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1382120795; bh=LLzzSrBDWEyHCX4a0Eg6NeaYq30wzepwpxzP03TU3DI=; h=From:To:Subject:Date:In-Reply-To:References; b=V8hd2XYNgQxYb0hzJu0Kb01XBJInc7cfRuRjV6NZcGmJQdmWdqZ464PSu0F8Anmdd mlnOtDNDK8SkIt82j3aEyaiteHWfosPbTVsuGlm9DYG8OEC0nzIFvuMTdA5WtbSJ7b xPVc3W630Zi1oYODUXUhHAVdE5mZ2fCkehzJj+hY= X-ASG-Debug-ID: 1382120794-03d6a5194b139720001-6jHSXT Received: from CAS1.int.fusionio.com (cas1.int.fusionio.com [10.101.1.40]) by mx1.fusionio.com with ESMTP id w1ZqZTKDRlWshjdj (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Fri, 18 Oct 2013 12:26:34 -0600 (MDT) X-Barracuda-Envelope-From: JBacik@fusionio.com Received: from localhost (10.101.1.160) by mail.fusionio.com (10.101.1.40) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 18 Oct 2013 12:26:33 -0600 From: Josef Bacik To: , Subject: [PATCH 2/8] xfstests: add regression test for kernel bz 60673 Date: Fri, 18 Oct 2013 14:26:24 -0400 X-ASG-Orig-Subj: [PATCH 2/8] xfstests: add regression test for kernel bz 60673 Message-ID: <1382120790-31060-2-git-send-email-jbacik@fusionio.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382120790-31060-1-git-send-email-jbacik@fusionio.com> References: <1382120790-31060-1-git-send-email-jbacik@fusionio.com> MIME-Version: 1.0 X-Originating-IP: [10.101.1.160] X-Barracuda-Connect: cas1.int.fusionio.com[10.101.1.40] X-Barracuda-Start-Time: 1382120794 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://10.101.1.180:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at fusionio.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.0000 1.0000 -2.0209 X-Barracuda-Spam-Score: -2.02 X-Barracuda-Spam-Status: No, SCORE=-2.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141571 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 There was a problem with send trying to overwrite a file that wasn't actually the same. This is a test to check this particular case where receive fails when it should succeed properly. I tested this to verify it fails without my fix and passes with my fix. Thanks, Signed-off-by: Josef Bacik --- tests/btrfs/015 | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/015.out | 2 + tests/btrfs/group | 1 + 3 files changed, 113 insertions(+) create mode 100644 tests/btrfs/015 create mode 100644 tests/btrfs/015.out diff --git a/tests/btrfs/015 b/tests/btrfs/015 new file mode 100644 index 0000000..f35600f --- /dev/null +++ b/tests/btrfs/015 @@ -0,0 +1,110 @@ +#! /bin/bash +# FS QA Test No. btrfs/015 +# +# btrfs send ENOENT regression test, kernel bugzilla 60673 +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 Fusion IO. 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" + +here=`pwd` +tmp=/tmp/$$ +tmp_dir=send_temp_$seq + +status=1 # failure is the default! + +_cleanup() +{ + $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap1 > /dev/null 2>&1 + $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap2 > /dev/null 2>&1 + $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1 + rm -rf $TEST_DIR/$tmp_dir + rm -f $tmp.* +} + +trap "_cleanup ; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch + +_scratch_mkfs > /dev/null 2>&1 + +#receive needs to be able to setxattrs, including the selinux context, if we use +#the normal nfs context thing it screws up our ability to set the +#security.selinux xattrs so we need to disable this for this test +export SELINUX_MOUNT_OPTIONS="" + +_scratch_mount + +mkdir $TEST_DIR/$tmp_dir +$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \ + > $seqres.full 2>&1 || _fail "failed subvol create" + +cd $TEST_DIR/$tmp_dir/send + +mkdir test +touch test/baz +touch test/blah +mkdir test/foo +touch test/foo/bar + +# cd out in case any of this fails +cd / + +$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ + $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed snap1" + +$BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send1.dump \ + $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed send" + +$BTRFS_UTIL_PROG receive -f $TEST_DIR/$tmp_dir/send1.dump $SCRATCH_MNT \ + >> $seqres.full 2>&1 || _fail "failed receive" + +#recreate everything exactly the way it was exceptn in a different order so we +#get different inode numbers +cd $TEST_DIR/$tmp_dir/send +rm -rf test +mkdir test +touch test/baz +mkdir test/foo +touch test/foo/bar +touch test/blah +cd / + +$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ + $TEST_DIR/$tmp_dir/snap2 >> $seqres.full 2>&1 || _fail "failed snap2" + +$BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send2.dump \ + $TEST_DIR/$tmp_dir/snap2 -p $TEST_DIR/$tmp_dir/snap1 \ + >> $seqres.full 2>&1 || _fail "failed second send" + +$BTRFS_UTIL_PROG receive -f $TEST_DIR/$tmp_dir/send2.dump $SCRATCH_MNT \ + >> $seqres.full 2>&1 || _fail "failed second receive" + +echo "Silence is golden" +status=0 ; exit diff --git a/tests/btrfs/015.out b/tests/btrfs/015.out new file mode 100644 index 0000000..fee0fcf --- /dev/null +++ b/tests/btrfs/015.out @@ -0,0 +1,2 @@ +QA output created by 015 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 07df957..a6f1820 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -17,3 +17,4 @@ 012 auto 013 auto quick 014 auto +015 auto quick