From patchwork Fri May 10 13:23:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 242980 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 08DA02C00D4 for ; Fri, 10 May 2013 23:23:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993Ab3EJNXv (ORCPT ); Fri, 10 May 2013 09:23:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56773 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659Ab3EJNXu (ORCPT ); Fri, 10 May 2013 09:23:50 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4ADNnYS017617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 May 2013 09:23:49 -0400 Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4ADNlaD001633 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Fri, 10 May 2013 09:23:48 -0400 Message-ID: <518CF4E3.4050504@redhat.com> Date: Fri, 10 May 2013 08:23:47 -0500 From: Eric Sandeen User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: xfs-oss CC: ext4 development Subject: [PATCH V2] xfstests: regression test for ext4 resize with non-extent files References: <518C1D08.4080309@redhat.com> In-Reply-To: <518C1D08.4080309@redhat.com> X-Enigmail-Version: 1.5.1 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Regression test for: c5c72d8 ext4: fix online resizing for ext3-compat file systems Signed-off-by: Eric Sandeen --- V2: s/dangerous/auto/ good luck! -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/ext4/306 b/tests/ext4/306 new file mode 100755 index 0000000..6a961ee --- /dev/null +++ b/tests/ext4/306 @@ -0,0 +1,83 @@ +#! /bin/bash +# FS QA Test No. ext4/306 +# +# Test that blocks are available to non-extent files after a resize2fs +# Regression test for commit: +# c5c72d8 ext4: fix online resizing for ext3-compat file systems +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 Red Hat, Inc. 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" + +PIDS="" +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + _scratch_unmount +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs ext4 +_supported_os Linux + +_require_scratch + +# This needs to mount ext3; might require ext3 driver, or ext4 +# might handle it itself. Find out if we have it one way or another. +modprobe ext3 > /dev/null 2>&1 +grep -q ext3 /proc/filesystems || _notrun "This test requires ext3 support" + +rm -f $seqres.full +echo "Silence is golden" + +# Make a small ext3 fs, (extents disabled) & mount it +yes | mkfs.ext3 $SCRATCH_DEV 512m >> $seqres.full 2>&1 +_scratch_mount -t ext3 || _fail "couldn't mount fs as ext3" +# Create a small non-extent-based file +echo "Create 1m testfile1" +$XFS_IO_PROG -f $SCRATCH_MNT/testfile1 -c "pwrite 0 1m" | _filter_xfs_io +echo "Create testfile2 to fill the fs" +# A large non-extent-based file filling the fs; this will run out & fail +$XFS_IO_PROG -f $SCRATCH_MNT/testfile2 -c "pwrite 0 512m" | _filter_xfs_io + +# Remount as ext4 +_scratch_unmount +_scratch_mount -t ext4 || _fail "couldn't remount fs as ext4" +df -h $SCRATCH_MNT >> $seqres.full + +# Grow it by 512m +echo "Resize to 1g" +resize2fs $SCRATCH_DEV 1g >> $seqres.full 2>&1 || _fail "Could not resize to 1g" +df -h $SCRATCH_MNT >> $seqres.full + +# See if we can add more blocks to the files +echo "append 2m to testfile1" +$XFS_IO_PROG -f $SCRATCH_MNT/testfile1 -c "pwrite 1m 2m" | _filter_xfs_io +echo "append 2m to testfile2" +$XFS_IO_PROG -f $SCRATCH_MNT/testfile1 -c "pwrite 512m 2m" | _filter_xfs_io + +status=0 +exit diff --git a/tests/ext4/306.out b/tests/ext4/306.out new file mode 100644 index 0000000..654637d --- /dev/null +++ b/tests/ext4/306.out @@ -0,0 +1,14 @@ +QA output created by 306 +Silence is golden +Create 1m testfile1 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Create testfile2 to fill the fs +pwrite64: No space left on device +Resize to 1g +append 2m to testfile1 +wrote 2097152/2097152 bytes at offset 1048576 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +append 2m to testfile2 +wrote 2097152/2097152 bytes at offset 536870912 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/ext4/group b/tests/ext4/group index 53af708..4c3e2f4 100644 --- a/tests/ext4/group +++ b/tests/ext4/group @@ -9,3 +9,4 @@ 303 aio dangerous ioctl rw stress 304 aio dangerous ioctl rw stress 305 auto +306 auto rw resize quick