| Message ID | 20171122123215.32292-2-rgoldwyn@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 22, 2017 at 06:32:15AM -0600, Goldwyn Rodrigues wrote: > From: Goldwyn Rodrigues <rgoldwyn@suse.com> > > Getting an error midway through a direct write would return an error > and the error-code is returned in the write() call. However, partial > data is over-written during the call. > > This tests simulates the ENOSPC error to check for partial direct > write consistency. > > Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> > --- > tests/generic/470 | 0 > tests/generic/471 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/471.out | 9 ++++++ > tests/generic/group | 1 + > 4 files changed, 99 insertions(+) > mode change 100644 => 100755 tests/generic/470 > create mode 100755 tests/generic/471 > create mode 100644 tests/generic/471.out > > diff --git a/tests/generic/470 b/tests/generic/470 > old mode 100644 > new mode 100755 Belongs in previous patch. > diff --git a/tests/generic/471 b/tests/generic/471 > new file mode 100755 > index 00000000..79ad70a6 > --- /dev/null > +++ b/tests/generic/471 > @@ -0,0 +1,89 @@ > +#! /bin/bash > +# FS QA Test No. 471 > +# > +# write() to a file opened with O_DIRECT with count > remaining > +# bytes. Result should be either the write should return remaining bytes > +# (to aligned bytes) instead of ENOSPC error. > +# > +# Fixes: Direct write() returns error but file contents are updated > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2017, SUSE Linux Products. 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.* $testdir1 > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/populate > +. ./common/filter > +. ./common/attr > + > +# real QA test starts here > +_supported_os Linux > +_require_odirect > + > +rm -f $seqres.full > + > +echo "Reformat with 320M size" > +umount $SCRATCH_MNT > +sz_bytes=$((320 * 1024 * 1024)) > +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 > +_scratch_mount >> $seqres.full 2>&1 > +testdir=$SCRATCH_MNT/test-$seq > +rm -rf $testdir > +mkdir $testdir > +sync > + > +#Almost fill the filesystem > +echo "Almost fill the filesystem" > +for i in `seq 1 5`; do > + $XFS_IO_PROG -f -c "pwrite 0 40M" $testdir/file-$i > /dev/null > +done _fill_fs ? Or, why not just write one 200M file and sync it? --D > + > +# Create a file using buffered I/O which succeeds only partially > +$XFS_IO_PROG -f -c "pwrite -w -S 0xaa 0 128M" $testdir/partial > + > +# re-write using direct I/O with default pattern using one single buffer > +write_size=`$XFS_IO_PROG -d -c "pwrite -O -V 1 -b 128M 0 128M" $testdir/partial | awk '/^wrote/ {split($2, bytes, "/"); print bytes[1]}'` > +if [ -z $write_size ]; then > + write_size=0 > +fi > +if [ $write_size -gt 0 ]; then > + echo "pwrite wrote more than zero bytes." > +else > + echo "pwrite wrote $write_size" > +fi > + > +# read the partial file to check if data written is correct > +$XFS_IO_PROG -d -c "pread 0 2M -v" $testdir/partial | _filter_xfs_io_unique > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/471.out b/tests/generic/471.out > new file mode 100644 > index 00000000..e01687c8 > --- /dev/null > +++ b/tests/generic/471.out > @@ -0,0 +1,9 @@ > +QA output created by 471 > +Reformat with 320M size > +Almost fill the filesystem > +pwrite: No space left on device > +pwrite wrote more than zero bytes. > +00000000: cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd ................ > +* > +read 2097152/2097152 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > diff --git a/tests/generic/group b/tests/generic/group > index 11ccfb01..f4591620 100644 > --- a/tests/generic/group > +++ b/tests/generic/group > @@ -473,3 +473,4 @@ > 468 shutdown auto quick metadata > 469 auto quick > 470 auto quick > +471 auto quick rw > -- > 2.14.2 > > -- > 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 -- 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
diff --git a/tests/generic/470 b/tests/generic/470 old mode 100644 new mode 100755 diff --git a/tests/generic/471 b/tests/generic/471 new file mode 100755 index 00000000..79ad70a6 --- /dev/null +++ b/tests/generic/471 @@ -0,0 +1,89 @@ +#! /bin/bash +# FS QA Test No. 471 +# +# write() to a file opened with O_DIRECT with count > remaining +# bytes. Result should be either the write should return remaining bytes +# (to aligned bytes) instead of ENOSPC error. +# +# Fixes: Direct write() returns error but file contents are updated +# +#----------------------------------------------------------------------- +# Copyright (c) 2017, SUSE Linux Products. 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.* $testdir1 +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/populate +. ./common/filter +. ./common/attr + +# real QA test starts here +_supported_os Linux +_require_odirect + +rm -f $seqres.full + +echo "Reformat with 320M size" +umount $SCRATCH_MNT +sz_bytes=$((320 * 1024 * 1024)) +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 +testdir=$SCRATCH_MNT/test-$seq +rm -rf $testdir +mkdir $testdir +sync + +#Almost fill the filesystem +echo "Almost fill the filesystem" +for i in `seq 1 5`; do + $XFS_IO_PROG -f -c "pwrite 0 40M" $testdir/file-$i > /dev/null +done + +# Create a file using buffered I/O which succeeds only partially +$XFS_IO_PROG -f -c "pwrite -w -S 0xaa 0 128M" $testdir/partial + +# re-write using direct I/O with default pattern using one single buffer +write_size=`$XFS_IO_PROG -d -c "pwrite -O -V 1 -b 128M 0 128M" $testdir/partial | awk '/^wrote/ {split($2, bytes, "/"); print bytes[1]}'` +if [ -z $write_size ]; then + write_size=0 +fi +if [ $write_size -gt 0 ]; then + echo "pwrite wrote more than zero bytes." +else + echo "pwrite wrote $write_size" +fi + +# read the partial file to check if data written is correct +$XFS_IO_PROG -d -c "pread 0 2M -v" $testdir/partial | _filter_xfs_io_unique + +# success, all done +status=0 +exit diff --git a/tests/generic/471.out b/tests/generic/471.out new file mode 100644 index 00000000..e01687c8 --- /dev/null +++ b/tests/generic/471.out @@ -0,0 +1,9 @@ +QA output created by 471 +Reformat with 320M size +Almost fill the filesystem +pwrite: No space left on device +pwrite wrote more than zero bytes. +00000000: cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd ................ +* +read 2097152/2097152 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/generic/group b/tests/generic/group index 11ccfb01..f4591620 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -473,3 +473,4 @@ 468 shutdown auto quick metadata 469 auto quick 470 auto quick +471 auto quick rw