From patchwork Mon Jul 1 15:19:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen De Wit X-Patchwork-Id: 2808281 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 A5FEDBF4A1 for ; Mon, 1 Jul 2013 15:20:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44043200E5 for ; Mon, 1 Jul 2013 15:20:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F24A4200D4 for ; Mon, 1 Jul 2013 15:20:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156Ab3GAPUk (ORCPT ); Mon, 1 Jul 2013 11:20:40 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:25325 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171Ab3GAPUj (ORCPT ); Mon, 1 Jul 2013 11:20:39 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r61FEHQ0008807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Jul 2013 15:14:18 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r61FKap7027494 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 1 Jul 2013 15:20:36 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by userz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r61FKZR5027475; Mon, 1 Jul 2013 15:20:36 GMT Received: from [10.175.38.41] (/10.175.38.41) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 01 Jul 2013 08:20:35 -0700 Message-ID: <51D19DF9.2080007@oracle.com> Date: Mon, 01 Jul 2013 17:19:21 +0200 From: Koen De Wit User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.16) Gecko/20111110 Icedove/3.0.11 MIME-Version: 1.0 To: xfs@oss.sgi.com, linux-btrfs@vger.kernel.org Subject: [PATCH v2] xfstests: btrfs/316: cross-subvolume sparse copy X-Source-IP: ucsinet22.oracle.com [156.151.31.94] 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This testscript creates reflinks to files on different subvolumes, overwrites the original files and reflinks, and moves reflinked files between subvolumes. Originally submitted as testcase 302, changes are made based on comments from Eric: http://oss.sgi.com/archives/xfs/2013-03/msg00231.html Two new common/rc functions used in this script (_require_cp_reflink and _verify_reflink) have been submitted recently: http://oss.sgi.com/archives/xfs/2013-05/msg00745.html Thanks to Eric Sandeen and Dave Chinner for the reviews. Signed-off-by: Koen De Wit --- tests/btrfs/316 | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/316.out | 39 +++++++++++++++ tests/btrfs/group | 1 + 3 files changed, 170 insertions(+), 0 deletions(-) create mode 100755 tests/btrfs/316 create mode 100644 tests/btrfs/316.out diff --git a/tests/btrfs/316 b/tests/btrfs/316 new file mode 100755 index 0000000..7c9c368 --- /dev/null +++ b/tests/btrfs/316 @@ -0,0 +1,130 @@ +#! /bin/bash +# FS QA Test No. btrfs/316 +# +# Testing cross-subvolume sparse copy on btrfs +# - Create two subvolumes, mount one of them +# - Create a file on each (sub/root)volume, +# reflink them on the other volumes +# - Change one original and two reflinked files +# - Move reflinked files between subvolumes +# +#----------------------------------------------------------------------- +# Copyright (c) 2013, Oracle and/or its affiliates. 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` +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + umount $SCRATCH_MNT + rm -rf $TESTDIR1 + rm -rf $TESTDIR2 + btrfs subvolume delete $SUBVOL1 >> $seqres.full + btrfs subvolume delete $SUBVOL2 >> $seqres.full + cd / + 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_cp_reflink + +_checksum_files() { + for F in file1 file2 file3 + do + for D in $TESTDIR1 $SCRATCH_MNT $SUBVOL2 + do + md5sum $D/$F | _filter_test_dir | _filter_scratch + done + done +} + +TESTDIR1=$TEST_DIR/test-$seq-1 +TESTDIR2=$TEST_DIR/test-$seq-2 +SUBVOL1=$TEST_DIR/subvol-$seq-1 +SUBVOL2=$TEST_DIR/subvol-$seq-2 + +_scratch_unmount 2>/dev/null +rm -rf $seqres.full +rm -rf $TESTDIR1 $TESTDIR2 +btrfs subvol delete $SUBVOL1 >/dev/null 2>&1 +btrfs subvol delete $SUBVOL2 >/dev/null 2>&1 + +mkdir $TESTDIR1 +mkdir $TESTDIR2 +btrfs subvolume create $SUBVOL1 >> $seqres.full +btrfs subvolume create $SUBVOL2 >> $seqres.full +_mount -t btrfs -o subvol=subvol-$seq-1 $TEST_DEV $SCRATCH_MNT + +echo "Create initial files" +# TESTDIR1/file1 is very small and will be inlined +$XFS_IO_PROG -f -c 'pwrite -S 0x61 0 10' $TESTDIR1/file1 >> $seqres.full +$XFS_IO_PROG -f -c 'pwrite -S 0x62 0 13000' $SCRATCH_MNT/file2 >> $seqres.full +$XFS_IO_PROG -f -c 'pwrite -S 0x63 0 17000' $SUBVOL2/file3 >> $seqres.full + +echo "Create reflinks to the initial files on other subvolumes" +cp --reflink $TESTDIR1/file1 $SUBVOL1 +cp --reflink $TESTDIR1/file1 $SUBVOL2 +cp --reflink $SUBVOL1/file2 $TESTDIR1/ +cp --reflink $SUBVOL1/file2 $SUBVOL2 +cp --reflink $SUBVOL2/file3 $TESTDIR1/ +cp --reflink $SUBVOL2/file3 $SUBVOL1 + +echo "Verify the reflinks" +_verify_reflink $SCRATCH_MNT/file2 $TESTDIR1/file2 +_verify_reflink $SCRATCH_MNT/file2 $SUBVOL2/file2 +_verify_reflink $SUBVOL2/file3 $TESTDIR1/file3 +_verify_reflink $SUBVOL2/file3 $SCRATCH_MNT/file3 +echo "Verify the file contents:" +_checksum_files + +echo -e "---\nOverwrite some files with new content" +$XFS_IO_PROG -c 'pwrite -S 0x64 0 20' $TESTDIR1/file1 >> $seqres.full +$XFS_IO_PROG -c 'pwrite -S 0x66 0 21000' $SUBVOL2/file2 >> $seqres.full +$XFS_IO_PROG -c 'pwrite -S 0x65 5000 5000' $SCRATCH_MNT/file3 >> $seqres.full + +echo "Verify that non-overwritten reflinks still have the same data blocks" +_verify_reflink $TESTDIR1/file2 $SCRATCH_MNT/file2 +_verify_reflink $TESTDIR1/file3 $SUBVOL2/file3 +echo "Verify the file contents:" +_checksum_files + +echo -e "---\nShuffle files between directories" +mv $TESTDIR1/file* $TESTDIR2 +mv $SCRATCH_MNT/file* $TESTDIR1/ +mv $SUBVOL2/file* $SCRATCH_MNT/ +mv $TESTDIR2/file* $SUBVOL2/ + +# No _verify_reflink here as data is copied when moving files between subvols +echo "Verify the file contents:" +_checksum_files + +# success, all done +status=0 +exit diff --git a/tests/btrfs/316.out b/tests/btrfs/316.out new file mode 100644 index 0000000..fbfa550 --- /dev/null +++ b/tests/btrfs/316.out @@ -0,0 +1,39 @@ +QA output created by 316 +Create initial files +Create reflinks to the initial files on other subvolumes +Verify the reflinks +Verify the file contents: +e09c80c42fda55f9d992e59ca6b3307d TEST_DIR/test-302-1/file1 +e09c80c42fda55f9d992e59ca6b3307d SCRATCH_MNT/file1 +e09c80c42fda55f9d992e59ca6b3307d TEST_DIR/subvol-302-2/file1 +d7402b46310fbbfbc5e466b1dccb043b TEST_DIR/test-302-1/file2 +d7402b46310fbbfbc5e466b1dccb043b SCRATCH_MNT/file2 +d7402b46310fbbfbc5e466b1dccb043b TEST_DIR/subvol-302-2/file2 +5a95800e4c04b11117aa4e4de057721f TEST_DIR/test-302-1/file3 +5a95800e4c04b11117aa4e4de057721f SCRATCH_MNT/file3 +5a95800e4c04b11117aa4e4de057721f TEST_DIR/subvol-302-2/file3 +--- +Overwrite some files with new content +Verify that non-overwritten reflinks still have the same data blocks +Verify the file contents: +00d620f69f30327f0f8946b95c12de44 TEST_DIR/test-302-1/file1 +e09c80c42fda55f9d992e59ca6b3307d SCRATCH_MNT/file1 +e09c80c42fda55f9d992e59ca6b3307d TEST_DIR/subvol-302-2/file1 +d7402b46310fbbfbc5e466b1dccb043b TEST_DIR/test-302-1/file2 +d7402b46310fbbfbc5e466b1dccb043b SCRATCH_MNT/file2 +917619ae44b38bb9968af261c3c45440 TEST_DIR/subvol-302-2/file2 +5a95800e4c04b11117aa4e4de057721f TEST_DIR/test-302-1/file3 +b9f275cd638cb784c9e61def94c622a8 SCRATCH_MNT/file3 +5a95800e4c04b11117aa4e4de057721f TEST_DIR/subvol-302-2/file3 +--- +Shuffle files between directories +Verify the file contents: +e09c80c42fda55f9d992e59ca6b3307d TEST_DIR/test-302-1/file1 +e09c80c42fda55f9d992e59ca6b3307d SCRATCH_MNT/file1 +00d620f69f30327f0f8946b95c12de44 TEST_DIR/subvol-302-2/file1 +d7402b46310fbbfbc5e466b1dccb043b TEST_DIR/test-302-1/file2 +917619ae44b38bb9968af261c3c45440 SCRATCH_MNT/file2 +d7402b46310fbbfbc5e466b1dccb043b TEST_DIR/subvol-302-2/file2 +b9f275cd638cb784c9e61def94c622a8 TEST_DIR/test-302-1/file3 +5a95800e4c04b11117aa4e4de057721f SCRATCH_MNT/file3 +5a95800e4c04b11117aa4e4de057721f TEST_DIR/subvol-302-2/file3 diff --git a/tests/btrfs/group b/tests/btrfs/group index bc6c256..a6d8de1 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -9,3 +9,4 @@ 276 auto rw metadata 284 auto 307 auto quick +316 auto quick