* [PATCH] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
@ 2017-03-18 1:26 Calvin Owens
2017-03-20 6:38 ` Eryu Guan
0 siblings, 1 reply; 8+ messages in thread
From: Calvin Owens @ 2017-03-18 1:26 UTC (permalink / raw)
To: fstests; +Cc: kernel-team, calvinowens
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 | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/generic/418.out | 3 +++
tests/generic/group | 1 +
3 files changed, 73 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..658c4c3
--- /dev/null
+++ b/tests/generic/418
@@ -0,0 +1,69 @@
+#! /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
+
+testfile="${TEST_DIR}/testfile"
+
+echo "Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)"
+dd if=/dev/urandom of=$testfile bs=2048 count=1 >/dev/null 2>/dev/null
+
+# FIXME: A bug in xfs_io prevents multiple flags in mode from being set at once,
+# use the standard command to test this until that is fixed.
+
+#$XFS_IO_PROG -c "falloc -k -p 2048 2048" $testfile
+fallocate -n -p -l 2048 -o 2048 $testfile
+
+$XFS_IO_PROG -c "stat" $testfile 2>/dev/null | 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..9927731
--- /dev/null
+++ b/tests/generic/418.out
@@ -0,0 +1,3 @@
+QA output created by 418
+Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
+stat.size = 2048
diff --git a/tests/generic/group b/tests/generic/group
index f0096bb..a2368ae 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
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-18 1:26 [PATCH] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE Calvin Owens
@ 2017-03-20 6:38 ` Eryu Guan
2017-03-20 20:01 ` Calvin Owens
0 siblings, 1 reply; 8+ messages in thread
From: Eryu Guan @ 2017-03-20 6:38 UTC (permalink / raw)
To: Calvin Owens; +Cc: fstests, kernel-team
On Fri, Mar 17, 2017 at 06:26:01PM -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 | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/generic/418.out | 3 +++
> tests/generic/group | 1 +
> 3 files changed, 73 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..658c4c3
> --- /dev/null
> +++ b/tests/generic/418
> @@ -0,0 +1,69 @@
> +#! /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
> +
> +testfile="${TEST_DIR}/testfile"
> +
> +echo "Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)"
> +dd if=/dev/urandom of=$testfile bs=2048 count=1 >/dev/null 2>/dev/null
Any reason to use /dev/urandom? I think a plain xfs_io pwrite would be
sufficient?
$XFS_IO_PROG -fc "pwrite -b 2048 0 2048" $testfile
> +
> +# FIXME: A bug in xfs_io prevents multiple flags in mode from being set at once,
> +# use the standard command to test this until that is fixed.
> +
> +#$XFS_IO_PROG -c "falloc -k -p 2048 2048" $testfile
> +fallocate -n -p -l 2048 -o 2048 $testfile
Seems fpunch command from xfs_io already sets KEEP_SIZE flag, a strace
run of "xfs_io -c 'fpunch 0 4m' file" shows flag is 03:
fallocate(3, 03, 0, 4194304) = 0
And the flag definitions:
#define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */
#define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
I also tested fpunch command and it could reproduce the failure on XFS too.
> +
> +$XFS_IO_PROG -c "stat" $testfile 2>/dev/null | 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..9927731
> --- /dev/null
> +++ b/tests/generic/418.out
> @@ -0,0 +1,3 @@
> +QA output created by 418
> +Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
> +stat.size = 2048
> diff --git a/tests/generic/group b/tests/generic/group
> index f0096bb..a2368ae 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
We can add it to 'punch' group too.
Thanks,
Eryu
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-20 6:38 ` Eryu Guan
@ 2017-03-20 20:01 ` Calvin Owens
2017-03-31 4:24 ` [PATCH v2] " Calvin Owens
0 siblings, 1 reply; 8+ messages in thread
From: Calvin Owens @ 2017-03-20 20:01 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, kernel-team
On 03/19/2017 11:38 PM, Eryu Guan wrote:
> On Fri, Mar 17, 2017 at 06:26:01PM -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 | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
>> tests/generic/418.out | 3 +++
>> tests/generic/group | 1 +
>> 3 files changed, 73 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..658c4c3
>> --- /dev/null
>> +++ b/tests/generic/418
>> @@ -0,0 +1,69 @@
>> +#! /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
>> +
>> +testfile="${TEST_DIR}/testfile"
>> +
>> +echo "Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)"
>> +dd if=/dev/urandom of=$testfile bs=2048 count=1 >/dev/null 2>/dev/null
>
> Any reason to use /dev/urandom? I think a plain xfs_io pwrite would be
> sufficient?
>
> $XFS_IO_PROG -fc "pwrite -b 2048 0 2048" $testfile
Will do.
>> +
>> +# FIXME: A bug in xfs_io prevents multiple flags in mode from being set at once,
>> +# use the standard command to test this until that is fixed.
>> +
>> +#$XFS_IO_PROG -c "falloc -k -p 2048 2048" $testfile
>> +fallocate -n -p -l 2048 -o 2048 $testfile
>
> Seems fpunch command from xfs_io already sets KEEP_SIZE flag, a strace
> run of "xfs_io -c 'fpunch 0 4m' file" shows flag is 03:
>
> fallocate(3, 03, 0, 4194304) = 0
>
> And the flag definitions:
> #define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */
> #define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
>
> I also tested fpunch command and it could reproduce the failure on XFS too.
Yep: I missed that and thought we just had "falloc", I'll respin with "fpunch"
>> +
>> +$XFS_IO_PROG -c "stat" $testfile 2>/dev/null | 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..9927731
>> --- /dev/null
>> +++ b/tests/generic/418.out
>> @@ -0,0 +1,3 @@
>> +QA output created by 418
>> +Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
>> +stat.size = 2048
>> diff --git a/tests/generic/group b/tests/generic/group
>> index f0096bb..a2368ae 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
>
> We can add it to 'punch' group too.
Will do.
> Thanks,
> Eryu
>
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at https://urldefense.proofpoint.com/v2/url?u=http-3A__vger.kernel.org_majordomo-2Dinfo.html&d=DwIC-g&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=-yMrTV4jriXR7ieyzzjV-QgHBD0UDw8ixoR77aMeAHE&m=nKbpX1RQLP518Tq3AQX32p_ho0JDmWXdh_dIVESCT0Q&s=NCUHxYtLkLOr4XT6OjganBTsMp20IxLBrjFKoKELobI&e=
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-20 20:01 ` Calvin Owens
@ 2017-03-31 4:24 ` Calvin Owens
2017-03-31 5:30 ` Eryu Guan
0 siblings, 1 reply; 8+ messages in thread
From: Calvin Owens @ 2017-03-31 4:24 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, kernel-team
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
+
+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
+$XFS_IO_PROG -c "fpunch 2048 2048" $testfile
+$XFS_IO_PROG -c "stat" $testfile 2>/dev/null | 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..9927731
--- /dev/null
+++ b/tests/generic/418.out
@@ -0,0 +1,3 @@
+QA output created by 418
+Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
+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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-31 4:24 ` [PATCH v2] " Calvin Owens
@ 2017-03-31 5:30 ` Eryu Guan
2017-03-31 16:11 ` Darrick J. Wong
0 siblings, 1 reply; 8+ messages in thread
From: Eryu Guan @ 2017-03-31 5:30 UTC (permalink / raw)
To: Calvin Owens; +Cc: fstests, kernel-team
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
> +
> +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.
$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.
Thanks,
Eryu
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/generic/418.out b/tests/generic/418.out
> new file mode 100644
> index 0000000..9927731
> --- /dev/null
> +++ b/tests/generic/418.out
> @@ -0,0 +1,3 @@
> +QA output created by 418
> +Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
> +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
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-31 5:30 ` Eryu Guan
@ 2017-03-31 16:11 ` Darrick J. Wong
2017-04-01 1:21 ` Calvin Owens
2017-04-01 3:41 ` Eryu Guan
0 siblings, 2 replies; 8+ messages in thread
From: Darrick J. Wong @ 2017-03-31 16:11 UTC (permalink / raw)
To: Eryu Guan; +Cc: Calvin Owens, fstests, kernel-team
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".
> > +
> > +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.
>
> $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.
--D
>
> Thanks,
> Eryu
>
> > +
> > +# success, all done
> > +status=0
> > +exit
> > diff --git a/tests/generic/418.out b/tests/generic/418.out
> > new file mode 100644
> > index 0000000..9927731
> > --- /dev/null
> > +++ b/tests/generic/418.out
> > @@ -0,0 +1,3 @@
> > +QA output created by 418
> > +Testing fallocate(mode=FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE)
> > +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
> >
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-31 16:11 ` Darrick J. Wong
@ 2017-04-01 1:21 ` Calvin Owens
2017-04-01 3:41 ` Eryu Guan
1 sibling, 0 replies; 8+ messages in thread
From: Calvin Owens @ 2017-04-01 1:21 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Eryu Guan, fstests, kernel-team
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE
2017-03-31 16:11 ` Darrick J. Wong
2017-04-01 1:21 ` Calvin Owens
@ 2017-04-01 3:41 ` Eryu Guan
1 sibling, 0 replies; 8+ messages in thread
From: Eryu Guan @ 2017-04-01 3:41 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Calvin Owens, fstests, kernel-team
On Fri, Mar 31, 2017 at 09:11:26AM -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".
Ah, I missed that, thanks for the review!
>
> > > +
> > > +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.
> >
> > $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.
Agreed, that's a even better solution :)
Thanks,
Eryu
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-01 3:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-18 1:26 [PATCH] generic/418: Add test for fallocate() PUNCH_HOLE|KEEP_SIZE Calvin Owens
2017-03-20 6:38 ` Eryu Guan
2017-03-20 20:01 ` Calvin Owens
2017-03-31 4:24 ` [PATCH v2] " Calvin Owens
2017-03-31 5:30 ` Eryu Guan
2017-03-31 16:11 ` Darrick J. Wong
2017-04-01 1:21 ` Calvin Owens
2017-04-01 3:41 ` Eryu Guan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.