From patchwork Mon Feb 17 00:20:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3659211 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 9D66EBF13A for ; Mon, 17 Feb 2014 00:21:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58F5D201EF for ; Mon, 17 Feb 2014 00:21:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D0F020176 for ; Mon, 17 Feb 2014 00:21:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752327AbaBQAVL (ORCPT ); Sun, 16 Feb 2014 19:21:11 -0500 Received: from mail-we0-f182.google.com ([74.125.82.182]:36657 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbaBQAVK (ORCPT ); Sun, 16 Feb 2014 19:21:10 -0500 Received: by mail-we0-f182.google.com with SMTP id u57so10303342wes.27 for ; Sun, 16 Feb 2014 16:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OwsgRtx0V1auZQ/giFTKlw5t0qDALRuyA84dqjyYf5E=; b=flrZ1+sJCjW7h6h0mcLrf6W/CoP8pONBp3M+CUDWp3r8eykd585qib00NtIZxE0Wuj USn+H/AuSq9w66dARthRwQZbMY9O7xpeFt2MGfxb4WvzlCYVW3XkvwELwlGSdIfOH8Si ADjzgPGW04hWVPpn/Wm5CBl7a0trO53Mw+tiledmCb6qf1AZ3WpWAuRQB8SrKDnKZYlm 8pALr6ypvJcKkMZnNCuc+gDUf1v7QMIWabor2hAhH+8ID2K/HOFGOGHJBvHv2ik54bkj xO91Fra+LiaB/QyUO+QdpuhTKolfICuj66Ho5zjM8GpNQyAmV07QBiZDQ3qTIzlD3BLO UB/g== X-Received: by 10.194.86.130 with SMTP id p2mr77619wjz.88.1392596468667; Sun, 16 Feb 2014 16:21:08 -0800 (PST) Received: from storm-desktop.lan (bl9-94-146.dsl.telepac.pt. [85.242.94.146]) by mx.google.com with ESMTPSA id dk9sm32325562wjb.4.2014.02.16.16.21.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Feb 2014 16:21:08 -0800 (PST) From: Filipe David Borba Manana To: xfs@oss.sgi.com Cc: linux-btrfs@vger.kernel.org, Filipe David Borba Manana Subject: [PATCH v3] xfstests: add regression test for btrfs incremental send Date: Mon, 17 Feb 2014 00:20:38 +0000 Message-Id: <1392596438-6509-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392408522-764-1-git-send-email-fdmanana@gmail.com> References: <1392408522-764-1-git-send-email-fdmanana@gmail.com> 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.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Test for a btrfs incremental send issue where we end up sending a wrong section of data from a file extent if the corresponding file extent is compressed and the respective file extent item has a non zero data offset. Fixed by the following linux kernel btrfs patch: Btrfs: use right clone root offset for compressed extents Signed-off-by: Filipe David Borba Manana --- V2: Made the test more reliable. Now it doesn't depend anymore of btrfs' hole punch implementation leaving hole file extent items when we punch beyond the file's current size. V3: Filter xfs_io output and make less use of the run_check function, as suggested by Dave Chinner. common/rc | 5 +++ tests/btrfs/040 | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/040.out | 9 ++++ tests/btrfs/group | 1 + 4 files changed, 134 insertions(+) create mode 100755 tests/btrfs/040 create mode 100644 tests/btrfs/040.out diff --git a/common/rc b/common/rc index e91568b..27be009 100644 --- a/common/rc +++ b/common/rc @@ -2207,6 +2207,11 @@ run_check() "$@" >> $seqres.full 2>&1 || _fail "failed: '$@'" } +_run_btrfs_util_prog() +{ + run_check $BTRFS_UTIL_PROG $* +} + init_rc() { if [ "$iam" == new ] diff --git a/tests/btrfs/040 b/tests/btrfs/040 new file mode 100755 index 0000000..9037782 --- /dev/null +++ b/tests/btrfs/040 @@ -0,0 +1,119 @@ +#! /bin/bash +# FS QA Test No. btrfs/040 +# +# Test for a btrfs incremental send issue where we end up sending a +# wrong section of data from a file extent if the corresponding file +# extent is compressed and the respective file extent item has a non +# zero data offset. +# +# Fixed by the following linux kernel btrfs patch: +# +# Btrfs: use right clone root offset for compressed extents +# +#----------------------------------------------------------------------- +# 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" + +here=`pwd` +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 +_need_to_be_root + +FSSUM_PROG=$here/src/fssum +[ -x $FSSUM_PROG ] || _notrun "fssum not built" + +rm -f $seqres.full + +_scratch_mkfs >/dev/null 2>&1 +_scratch_mount "-o compress-force=lzo" + +$XFS_IO_PROG -f -c "truncate 118811" $SCRATCH_MNT/foo +$XFS_IO_PROG -c "pwrite -S 0x0d -b 39987 92267 39987" \ + $SCRATCH_MNT/foo | _filter_xfs_io + +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ + $SCRATCH_MNT/mysnap1 + +$XFS_IO_PROG -c "pwrite -S 0x3e -b 80000 200000 80000" \ + $SCRATCH_MNT/foo | _filter_xfs_io + +# Sync to avoid btrfs merging file extent items, which would make the test +# succeed when it should fail. +_run_btrfs_util_prog filesystem sync $SCRATCH_MNT + +$XFS_IO_PROG -c "pwrite -S 0xdc -b 10000 250000 10000" \ + $SCRATCH_MNT/foo | _filter_xfs_io +$XFS_IO_PROG -c "pwrite -S 0xff -b 10000 300000 10000" \ + $SCRATCH_MNT/foo | _filter_xfs_io + +# will be used for incremental send to be able to issue clone operations +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ + $SCRATCH_MNT/clones_snap + +_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 \ + -x $SCRATCH_MNT/mysnap2/clones_snap $SCRATCH_MNT/mysnap2 +run_check $FSSUM_PROG -A -f -w $tmp/clones.fssum $SCRATCH_MNT/clones_snap \ + -x $SCRATCH_MNT/clones_snap/mysnap1 -x $SCRATCH_MNT/clones_snap/mysnap2 + +_run_btrfs_util_prog send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap +_run_btrfs_util_prog send $SCRATCH_MNT/clones_snap -f $tmp/clones.snap +_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 \ + -c $SCRATCH_MNT/clones_snap $SCRATCH_MNT/mysnap2 -f $tmp/2.snap + +_scratch_unmount +_check_btrfs_filesystem $SCRATCH_DEV + +_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 2>> $seqres.full + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/clones.snap +run_check $FSSUM_PROG -r $tmp/clones.fssum $SCRATCH_MNT/clones_snap 2>> $seqres.full + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap +run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full + +_scratch_unmount +_check_btrfs_filesystem $SCRATCH_DEV + +status=0 +exit diff --git a/tests/btrfs/040.out b/tests/btrfs/040.out new file mode 100644 index 0000000..cc77aed --- /dev/null +++ b/tests/btrfs/040.out @@ -0,0 +1,9 @@ +QA output created by 040 +wrote 39987/39987 bytes at offset 92267 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 80000/80000 bytes at offset 200000 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 10000/10000 bytes at offset 250000 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 10000/10000 bytes at offset 300000 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/btrfs/group b/tests/btrfs/group index 2ca2225..a687634 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -38,3 +38,4 @@ 033 auto quick 034 auto quick 036 auto quick +040 auto quick