From patchwork Fri Oct 18 18:26:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 3069491 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0CECDBF924 for ; Fri, 18 Oct 2013 18:26:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D18312039E for ; Fri, 18 Oct 2013 18:26:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A260F203DC for ; Fri, 18 Oct 2013 18:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756957Ab3JRS0l (ORCPT ); Fri, 18 Oct 2013 14:26:41 -0400 Received: from dkim1.fusionio.com ([66.114.96.53]:38365 "EHLO dkim1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756934Ab3JRS0j (ORCPT ); Fri, 18 Oct 2013 14:26:39 -0400 Received: from mx2.fusionio.com (unknown [10.101.1.160]) by dkim1.fusionio.com (Postfix) with ESMTP id ADF177C0427 for ; Fri, 18 Oct 2013 12:26:38 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1382120798; bh=mVpXJaRICKNZ1rXPHs4a/8SqB0oAW3IT6ot8oNHBRFk=; h=From:To:Subject:Date:In-Reply-To:References; b=ZPGTUgfk6fJqEd+mQb0BA8N5BSOIRIRU6c8uc9z+tcNe1f2Z+Uwp8/Sm6F418a89C OtQogKA8fDRJteYlJUfK5Wym4THLR6H2OrreilSkEifRoMW/40M27+HWA6AVbJTNzW fZZe9eVgSmBILhNx+SoMymFWBDXOauVn9H0LEGIU= X-ASG-Debug-ID: 1382120797-0421b56d4638500001-6jHSXT Received: from CAS1.int.fusionio.com (cas1.int.fusionio.com [10.101.1.40]) by mx2.fusionio.com with ESMTP id V6XGIY95KhcQ3eEE (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Fri, 18 Oct 2013 12:26:38 -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:37 -0600 From: Josef Bacik To: , Subject: [PATCH 4/8] xfstests: btrfs/016: a hole punching send test Date: Fri, 18 Oct 2013 14:26:26 -0400 X-ASG-Orig-Subj: [PATCH 4/8] xfstests: btrfs/016: a hole punching send test Message-ID: <1382120790-31060-4-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: 1382120798 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://10.101.1.181:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at fusionio.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global 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.141573 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 I recently added a patch to avoid sending holes with btrfs send, but I screwed it up by not sending a hole when we did a hole punch. This is an xfstest version of the test I wrote to show that I had a bug and to verify I was fixing it properly. This test properly fails with my old patch and passes with my good patch. Thanks, Signed-off-by: Josef Bacik Reviewed-by: Eric Sandeen --- tests/btrfs/016 | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/016.out | 2 ++ tests/btrfs/group | 1 + 3 files changed, 103 insertions(+) create mode 100644 tests/btrfs/016 create mode 100644 tests/btrfs/016.out diff --git a/tests/btrfs/016 b/tests/btrfs/016 new file mode 100644 index 0000000..d711ecb --- /dev/null +++ b/tests/btrfs/016 @@ -0,0 +1,100 @@ +#! /bin/bash +# FS QA Test No. btrfs/016 +# +# btrfs send hole punch test +# +#----------------------------------------------------------------------- +# 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=`mktemp -d` +tmp_dir=send_temp_$seq + +status=1 # failure is the default! + +_cleanup() +{ + $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap > /dev/null 2>&1 + $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap1 > /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 + +FSSUM_PROG=$here/src/fssum +[ -x $FSSUM_PROG ] || _notrun "fssum not built" + +_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" + +dd if=/dev/urandom of=$TEST_DIR/$tmp_dir/send/foo bs=1M count=10 >> $seqres.full \ + 2>&1 || _fail "dd failed" +$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ + $TEST_DIR/$tmp_dir/snap >> $seqres.full 2>&1 || _fail "failed snap" +$XFS_IO_PROG -c "fpunch 1m 1m" $TEST_DIR/$tmp_dir/send/foo +$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \ + $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail "failed snap" + +$FSSUM_PROG -A -f -w $tmp/fssum.snap $TEST_DIR/$tmp_dir/snap >> $seqres.full \ + 2>&1 || _fail "fssum gen failed" +$FSSUM_PROG -A -f -w $tmp/fssum.snap1 $TEST_DIR/$tmp_dir/snap1 >> $seqres.full \ + 2>&1 || _fail "fssum gen failed" + +$BTRFS_UTIL_PROG send $TEST_DIR/$tmp_dir/snap -f $tmp/send.snap >> \ + $seqres.full 2>&1 || _fail "failed send" +$BTRFS_UTIL_PROG send $TEST_DIR/$tmp_dir/snap1 -p $TEST_DIR/$tmp_dir/snap \ + -f $tmp/send.snap1 >> $seqres.full 2>&1 || _fail "failed send" + +$BTRFS_UTIL_PROG receive -f $tmp/send.snap $SCRATCH_MNT >> $seqres.full 2>&1 \ + || _fail "failed recv" +$BTRFS_UTIL_PROG receive -f $tmp/send.snap1 $SCRATCH_MNT >> $seqres.full 2>&1 \ + || _fail "failed recv" + +$FSSUM_PROG -r $tmp/fssum.snap $SCRATCH_MNT/snap >> $seqres.full 2>&1 \ + || _fail "fssum failed" +$FSSUM_PROG -r $tmp/fssum.snap1 $SCRATCH_MNT/snap1 >> $seqres.full 2>&1 \ + || _fail "fssum failed" + +echo "Silence is golden" +status=0 ; exit diff --git a/tests/btrfs/016.out b/tests/btrfs/016.out new file mode 100644 index 0000000..aa2526b --- /dev/null +++ b/tests/btrfs/016.out @@ -0,0 +1,2 @@ +QA output created by 016 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index a6f1820..082fd67 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -18,3 +18,4 @@ 013 auto quick 014 auto 015 auto quick +016 auto quick