Re: [PATCH v2] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE

[Calvin Owens <calvinowens@fb.com>]

On Friday 03/31 at 09:11 -0700, Darrick J. Wong wrote:
> On Fri, Mar 31, 2017 at 01:30:39PM +0800, Eryu Guan wrote:
> > On Thu, Mar 30, 2017 at 09:24:56PM -0700, Calvin Owens wrote:
> > > Verify that punching holes at ends of files does not alter st_size if we
> > > pass FALLOC_FL_KEEP_SIZE to fallocate().
> > > 
> > > Signed-off-by: Calvin Owens <calvinowens@fb.com>
> > > ---
> > >  tests/generic/418     | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
> > >  tests/generic/418.out |  3 +++
> > >  tests/generic/group   |  1 +
> > >  3 files changed, 67 insertions(+)
> > >  create mode 100755 tests/generic/418
> > >  create mode 100644 tests/generic/418.out
> > > 
> > > diff --git a/tests/generic/418 b/tests/generic/418
> > > new file mode 100755
> > > index 0000000..e04d08c
> > > --- /dev/null
> > > +++ b/tests/generic/418
> > > @@ -0,0 +1,63 @@
> > > +#! /bin/bash
> > > +# FS QA Test 418
> > > +#
> > > +# Verify fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE) does
> > > +# not alter the file size.
> > > +#
> > > +#-----------------------------------------------------------------------
> > > +# Copyright (c) 2017 Calvin Owens.  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 -f $tmp.*
> > > +}
> > > +
> > > +# get standard environment, filters and checks
> > > +. ./common/rc
> > > +. ./common/filter
> > > +
> > > +# remove previous $seqres.full before test
> > > +rm -f $seqres.full
> > > +
> > > +# real QA test starts here
> > > +
> > > +# Modify as appropriate.
> > > +_supported_fs generic
> > > +_supported_os Linux
> > > +_require_test
> 
> I think this test needs a "_require_xfs_io_command fpunch".

Will do.
 
> > > +
> > > +testfile="${TEST_DIR}/testfile"
> > > +
> > > +echo "Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)"
> > > +$XFS_IO_PROG -fc "pwrite -b 2048 0 2048" $testfile
> > 
> > Need to either discard the stdout or filter stdout then update .out
> > file, otherwise test fails with
> > 
> >     +wrote 2048/2048 bytes at offset 0
> >     +2 KiB, 1 ops; 0.0000 sec (122 MiB/sec and 62500.0000 ops/sec)
> > 
> > I think discarding stdout is sufficient, any pwrite error to stderr will
> > break golden image and fail the test.

That was a stupid thing to miss, my apologies :/

> > $XFS_IO_PROG -fc "pwrite -b 2048 0 2048" $testfile >/dev/null
> > 
> > > +$XFS_IO_PROG -c "fpunch 2048 2048" $testfile
> > > +$XFS_IO_PROG -c "stat" $testfile 2>/dev/null | grep -F 'stat.size'
> > 
> > Minor nit, I'd rather not discarding stderr, with similar reason above.
> > 
> > These are straightforward updates, I can fix them at commit time if
> > you're OK with the fixes.
> 
> Usually we toss the xfs_io stdout stuff into $seqres.full so that it's
> recorded somewhere just in case someone wants to see what xfs_io thinks
> it did.

Makes sense, new patch below.

Thanks,
Calvin

---8<---
From: Calvin Owens <calvinowens@fb.com>
Date: Fri, 31 Mar 2017 18:13:41 -0700
Subject: [PATCH v3] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE

Verify that punching holes at ends of files does not alter st_size if we
pass FALLOC_FL_KEEP_SIZE to fallocate().

Signed-off-by: Calvin Owens <calvinowens@fb.com>
---
 tests/generic/418     | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/418.out |  4 ++++
 tests/generic/group   |  1 +
 3 files changed, 69 insertions(+)
 create mode 100755 tests/generic/418
 create mode 100644 tests/generic/418.out

diff --git a/tests/generic/418 b/tests/generic/418
new file mode 100755
index 0000000..12599b1
--- /dev/null
+++ b/tests/generic/418
@@ -0,0 +1,64 @@
+#! /bin/bash
+# FS QA Test 418
+#
+# Verify fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE) does
+# not alter the file size.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2017 Calvin Owens.  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 -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_xfs_io_command fpunch
+
+testfile="${TEST_DIR}/testfile"
+
+echo "Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)"
+$XFS_IO_PROG -fc "pwrite -b 2048 0 2048" $testfile | head -n1
+$XFS_IO_PROG -c "fpunch 2048 2048" $testfile
+$XFS_IO_PROG -c "stat" $testfile | grep -F 'stat.size'
+
+# success, all done
+status=0
+exit
diff --git a/tests/generic/418.out b/tests/generic/418.out
new file mode 100644
index 0000000..805fc55
--- /dev/null
+++ b/tests/generic/418.out
@@ -0,0 +1,4 @@
+QA output created by 418
+Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
+wrote 2048/2048 bytes at offset 0
+stat.size = 2048
diff --git a/tests/generic/group b/tests/generic/group
index f0096bb..068aa61 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -420,3 +420,4 @@
 415 auto clone
 416 auto enospc
 417 auto quick shutdown log
+418 auto quick punch
-- 
2.9.3