From patchwork Thu Jul 21 23:47:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9242759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88CAB60574 for ; Thu, 21 Jul 2016 23:48:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78C64223A4 for ; Thu, 21 Jul 2016 23:48:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D7A727A98; Thu, 21 Jul 2016 23:48:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,LOTS_OF_MONEY, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 77C95223A4 for ; Thu, 21 Jul 2016 23:48:14 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id 4A9F77CB5; Thu, 21 Jul 2016 18:47:51 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 946D77CB5 for ; Thu, 21 Jul 2016 18:47:48 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 67671304039 for ; Thu, 21 Jul 2016 16:47:48 -0700 (PDT) X-ASG-Debug-ID: 1469144864-04cb6c0369584e0001-NocioJ Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by cuda.sgi.com with ESMTP id jvyFgK7V5dfTGcwA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 21 Jul 2016 16:47:44 -0700 (PDT) X-Barracuda-Envelope-From: darrick.wong@oracle.com X-Barracuda-Effective-Source-IP: userp1040.oracle.com[156.151.31.81] X-Barracuda-Apparent-Source-IP: 156.151.31.81 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u6LNlhrf008825 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jul 2016 23:47:43 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u6LNlhLv020363 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jul 2016 23:47:43 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u6LNlf3L032665; Thu, 21 Jul 2016 23:47:42 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 21 Jul 2016 16:47:40 -0700 Subject: [PATCH 13/17] xfs: test swapext with reflink From: "Darrick J. Wong" X-ASG-Orig-Subj: [PATCH 13/17] xfs: test swapext with reflink To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Date: Thu, 21 Jul 2016 16:47:38 -0700 Message-ID: <146914485888.11762.1688573359701830686.stgit@birch.djwong.org> In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> References: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0021.oracle.com [156.151.31.71] X-Barracuda-Connect: userp1040.oracle.com[156.151.31.81] X-Barracuda-Start-Time: 1469144864 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.176.15:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 12953 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.31435 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP Add a few tests to stress the new swapext code for reflink and rmap. Signed-off-by: Darrick J. Wong --- tests/xfs/873 | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/873.out | 6 +++ tests/xfs/874 | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/874.out | 10 +++++ tests/xfs/875 | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/875.out | 12 ++++++ tests/xfs/group | 3 + 7 files changed, 337 insertions(+) create mode 100755 tests/xfs/873 create mode 100644 tests/xfs/873.out create mode 100755 tests/xfs/874 create mode 100644 tests/xfs/874.out create mode 100755 tests/xfs/875 create mode 100644 tests/xfs/875.out diff --git a/tests/xfs/873 b/tests/xfs/873 new file mode 100755 index 0000000..a980148 --- /dev/null +++ b/tests/xfs/873 @@ -0,0 +1,107 @@ +#! /bin/bash +# FS QA Test No. 873 +# +# See how well xfs_fsr handles "defragging" a file with a hojillion extents. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016, 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"` +seqres="$RESULT_DIR/$seq" +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() +{ + cd / + rm -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr +. ./common/reflink + +# real QA test starts here +_supported_os Linux +_require_scratch_reflink +_require_cp_reflink +_require_test_program "punch-alternating" +test -x $XFS_FSR_PROG || _notrun "xfs_fsr not found" + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +mkdir "$testdir" + +# Setup for 16000 blocks, but we'll accept stress testing down to +# 2^10 blocks... that should be plenty for anyone. +fnr=$((12 + LOAD_FACTOR)) +free_blocks=$(stat -f -c '%a' "$testdir") +blksz=$(stat -f -c '%S' "$testdir") +space_avail=$((free_blocks * blksz)) +calc_space() { + blocks_needed=$(( 2 ** (fnr + 1) )) + space_needed=$((blocks_needed * blksz * 5 / 4)) +} +calc_space +while test $space_needed -gt $space_avail; do + fnr=$((fnr - 1)) + calc_space +done +test $fnr -lt 10 && _notrun "Insufficient space for stress test; would only create $blocks_needed extents." +bytes=$((blocks_needed * blksz)) + +echo "Create a many-block file" +echo "creating $blocks_needed blocks..." >> "$seqres.full" +_pwrite_byte 0x62 0 $blksz $testdir/file0 >> $seqres.full +"$XFS_IO_PROG" -f -c "pwrite -S 0x61 -b 4194304 0 $bytes" "$testdir/file1" >> "$seqres.full" +echo "punching..." >> "$seqres.full" +"$here/src/punch-alternating" "$testdir/file1" >> "$seqres.full" +seq 0 2 $((2 ** (fnr + 1) )) | while read lblk; do + _reflink_range $testdir/file0 0 $testdir/file1 $((lblk * blksz)) $blksz >> $seqres.full +done +echo "...done" >> "$seqres.full" +_scratch_cycle_mount + +echo "Reflink the big file" +echo "reflinking $((blocks_needed / 2)) blocks, $((bytes / 2)) bytes" >> "$seqres.full" +_reflink_range "$testdir/file1" 0 "$testdir/file2" 0 $bytes >> "$seqres.full" + +echo "Defrag the big file" +old_nextents=$(xfs_io -c 'stat -v' $testdir/file1 | grep 'nextents' | cut -d ' ' -f 3) +$XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full +new_nextents=$(xfs_io -c 'stat -v' $testdir/file1 | grep 'nextents' | cut -d ' ' -f 3) + +echo "Check extent count" +$XFS_IO_PROG -c 'stat -v' $testdir/file1 >> $seqres.full +$XFS_IO_PROG -c 'stat -v' $testdir/file2 >> $seqres.full +echo "extents: $old_nextents -> $new_nextents" >> $seqres.full +test $old_nextents -gt $new_nextents || echo "FAIL: $old_nextents -> $new_nextents" + +# success, all done +status=0 +exit diff --git a/tests/xfs/873.out b/tests/xfs/873.out new file mode 100644 index 0000000..9dddf55 --- /dev/null +++ b/tests/xfs/873.out @@ -0,0 +1,6 @@ +QA output created by 873 +Format and mount +Create a many-block file +Reflink the big file +Defrag the big file +Check extent count diff --git a/tests/xfs/874 b/tests/xfs/874 new file mode 100755 index 0000000..fb31ea8 --- /dev/null +++ b/tests/xfs/874 @@ -0,0 +1,99 @@ +#! /bin/bash +# FS QA Test No. 874 +# +# Ensure that xfs_fsr handles errors correctly while defragging files. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016, 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"` +seqres="$RESULT_DIR/$seq" +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() +{ + cd / + rm -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr +. ./common/reflink +. ./common/quota +. ./common/inject + +# real QA test starts here +_supported_os Linux +_require_scratch_reflink +_require_cp_reflink +test -x $XFS_FSR_PROG || _notrun "xfs_fsr not found" +_require_xfs_io_error_injection "bmap_finish_one" +_require_xfs_scratch_rmapbt + +_repquota() { + repquota $SCRATCH_MNT | egrep '^(fsgqa|root|nobody)' +} + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +blksz=65536 +blks=3 +mkdir "$testdir" + +echo "Create a many-block file" +_pwrite_byte 0x62 0 $((blksz * blks)) $testdir/file1 >> $seqres.full +_pwrite_byte 0x63 0 $blksz $testdir/file2 >> $seqres.full +_reflink_range $testdir/file2 0 $testdir/file1 $blksz $blksz >> $seqres.full +_scratch_cycle_mount +$XFS_IO_PROG -c 'bmap -v' $testdir/file1 >> $seqres.full + +echo "Inject error" +_scratch_inject_error "bmap_finish_one" + +echo "Defrag the file" +$XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full 2>&1 + +echo "FS should be shut down, touch will fail" +touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch + +echo "Remount to replay log" | tee /dev/ttyprintk +_scratch_inject_logprint >> $seqres.full + +echo "Check extent count" | tee /dev/ttyprintk +$XFS_IO_PROG -c 'stat -v' $testdir/file1 >> $seqres.full +$XFS_IO_PROG -c 'stat -v' $testdir/file2 >> $seqres.full +echo "extents: $old_nextents -> $new_nextents" >> $seqres.full + +echo "FS should be online, touch should succeed" +touch $SCRATCH_MNT/goodfs +$XFS_IO_PROG -c 'bmap -v' $testdir/file1 >> $seqres.full + +# success, all done +status=0 +exit diff --git a/tests/xfs/874.out b/tests/xfs/874.out new file mode 100644 index 0000000..dbc0f49 --- /dev/null +++ b/tests/xfs/874.out @@ -0,0 +1,10 @@ +QA output created by 874 +Format and mount +Create a many-block file +Inject error +Defrag the file +FS should be shut down, touch will fail +touch: cannot touch 'SCRATCH_MNT/badfs': Input/output error +Remount to replay log +Check extent count +FS should be online, touch should succeed diff --git a/tests/xfs/875 b/tests/xfs/875 new file mode 100755 index 0000000..17c28db --- /dev/null +++ b/tests/xfs/875 @@ -0,0 +1,100 @@ +#! /bin/bash +# FS QA Test No. 875 +# +# Ensure that xfs_fsr handles quota correctly while defragging files. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016, 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"` +seqres="$RESULT_DIR/$seq" +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() +{ + cd / + rm -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr +. ./common/reflink +. ./common/quota + +# real QA test starts here +_supported_os Linux +_require_scratch_reflink +_require_cp_reflink +test -x $XFS_FSR_PROG || _notrun "xfs_fsr not found" +_require_quota +_require_nobody + +_repquota() { + repquota $SCRATCH_MNT | egrep '^(fsgqa|root|nobody)' +} + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +export MOUNT_OPTIONS="-o usrquota,grpquota $MOUNT_OPTIONS" +_scratch_mount >> "$seqres.full" 2>&1 +quotacheck -u -g $SCRATCH_MNT 2> /dev/null +quotaon $SCRATCH_MNT 2> /dev/null + +testdir="$SCRATCH_MNT/test-$seq" +blksz=65536 +blks=3 +mkdir "$testdir" + +echo "Create a many-block file" +touch $testdir/file1 +chown nobody $testdir/file1 +touch $testdir/file2 +chown nobody $testdir/file2 +_pwrite_byte 0x62 0 $((blksz * blks)) $testdir/file1 >> $seqres.full +_pwrite_byte 0x63 0 $blksz $testdir/file2 >> $seqres.full +_reflink_range $testdir/file2 0 $testdir/file1 $blksz $blksz >> $seqres.full +_repquota +_scratch_cycle_mount + +echo "Defrag the file" +old_nextents=$(xfs_io -c 'stat -v' $testdir/file1 | grep 'nextents' | cut -d ' ' -f 3) +$XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full +new_nextents=$(xfs_io -c 'stat -v' $testdir/file1 | grep 'nextents' | cut -d ' ' -f 3) +_repquota + +echo "Remount the FS to see if accounting changes" +_scratch_cycle_mount +_repquota + +echo "Check extent count" +$XFS_IO_PROG -c 'stat -v' $testdir/file1 >> $seqres.full +$XFS_IO_PROG -c 'stat -v' $testdir/file2 >> $seqres.full +echo "extents: $old_nextents -> $new_nextents" >> $seqres.full +test $old_nextents -gt $new_nextents || echo "FAIL: $old_nextents -> $new_nextents" + +# success, all done +status=0 +exit diff --git a/tests/xfs/875.out b/tests/xfs/875.out new file mode 100644 index 0000000..57653e9 --- /dev/null +++ b/tests/xfs/875.out @@ -0,0 +1,12 @@ +QA output created by 875 +Format and mount +Create a many-block file +root -- 0 0 0 4 0 0 +nobody -- 256 0 0 2 0 0 +Defrag the file +root -- 0 0 0 4 0 0 +nobody -- 256 0 0 2 0 0 +Remount the FS to see if accounting changes +root -- 0 0 0 4 0 0 +nobody -- 256 0 0 2 0 0 +Check extent count diff --git a/tests/xfs/group b/tests/xfs/group index 5ccf3d6..16f7947 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -306,3 +306,6 @@ 325 auto quick clone 326 auto quick clone 327 auto quick clone +873 auto quick clone fsr +874 auto quick clone fsr +875 auto quick clone fsr quota