* [PATCH 1/2] common: remove all files in $SCRATCH_DEV for overlayfs in _scratch_cleanup_files() @ 2016-01-11 11:38 Eryu Guan 2016-01-11 11:38 ` [PATCH 2/2] overlay: test copy up files from lower dir Eryu Guan 0 siblings, 1 reply; 6+ messages in thread From: Eryu Guan @ 2016-01-11 11:38 UTC (permalink / raw) To: fstests; +Cc: linux-unionfs, Eryu Guan All files in lower/upper dirs should be removed for overlayfs in _scratch_cleanup_files(), not only files in merged dir, otherwise files from lower dir won't be removed. Signed-off-by: Eryu Guan <eguan@redhat.com> --- common/rc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/common/rc b/common/rc index e5ae1d0..e2a32da 100644 --- a/common/rc +++ b/common/rc @@ -701,9 +701,17 @@ _mkfs_dev() # remove all files in $SCRATCH_MNT, useful when testing on NFS/CIFS _scratch_cleanup_files() { - _scratch_mount - rm -rf $SCRATCH_MNT/* - _scratch_unmount + case $FSTYP in + overlay) + # $SCRATCH_DEV is a valid directory in overlay case + rm -rf $SCRATCH_DEV/* + ;; + *) + _scratch_mount + rm -rf $SCRATCH_MNT/* + _scratch_unmount + ;; + esac } _scratch_mkfs() -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] overlay: test copy up files from lower dir 2016-01-11 11:38 [PATCH 1/2] common: remove all files in $SCRATCH_DEV for overlayfs in _scratch_cleanup_files() Eryu Guan @ 2016-01-11 11:38 ` Eryu Guan 2016-01-11 20:31 ` Dave Chinner 0 siblings, 1 reply; 6+ messages in thread From: Eryu Guan @ 2016-01-11 11:38 UTC (permalink / raw) To: fstests; +Cc: linux-unionfs, Eryu Guan Test copy up files from lower dir that are <, =, > 4G in size. Kernel commit 0480334fa604 ("ovl: use O_LARGEFILE in ovl_copy_up()") fixed bug when copying up large file(>4G) from lower dir. Signed-off-by: Eryu Guan <eguan@redhat.com> --- tests/overlay/001 | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/001.out | 2 ++ tests/overlay/Makefile | 20 +++++++++++++ tests/overlay/group | 6 ++++ 4 files changed, 104 insertions(+) create mode 100755 tests/overlay/001 create mode 100644 tests/overlay/001.out create mode 100644 tests/overlay/Makefile create mode 100644 tests/overlay/group diff --git a/tests/overlay/001 b/tests/overlay/001 new file mode 100755 index 0000000..5025a69 --- /dev/null +++ b/tests/overlay/001 @@ -0,0 +1,76 @@ +#! /bin/bash +# FS QA Test 002 +# +# Test copy up files from lower dir that are <, =, > 4G in size. +# +# Kernel commit 0480334fa604 ("ovl: use O_LARGEFILE in ovl_copy_up()") +# fixed bug when copying up large file from lower dir. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 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" + +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 +_supported_fs overlay +_supported_os Linux +_require_scratch + +# Remove all files from previous tests +_scratch_mkfs + +# Create test files with different sizes in lower dir +# $SCRATCH_DEV is actually a test dir used in overlay testing +mkdir -p $SCRATCH_DEV/lower +touch $SCRATCH_DEV/lower/zero_size +$XFS_IO_PROG -fc "pwrite 0 4k" $SCRATCH_DEV/lower/less_than_4g >>$seqres.full +$XFS_IO_PROG -fc "pwrite 4294963200 4k" $SCRATCH_DEV/lower/4gfile >>$seqres.full +$XFS_IO_PROG -fc "pwrite 4g 4k" $SCRATCH_DEV/lower/larger_than_4g >>$seqres.full + +_scratch_mount + +echo "Silence is golden" + +# Open the files should succeed, no errors are expected (e.g. EFBIG) +for f in $SCRATCH_MNT/*; do + $XFS_IO_PROG -c "open" $f >>$seqres.full +done + +# success, all done +status=0 +exit diff --git a/tests/overlay/001.out b/tests/overlay/001.out new file mode 100644 index 0000000..88678b8 --- /dev/null +++ b/tests/overlay/001.out @@ -0,0 +1,2 @@ +QA output created by 001 +Silence is golden diff --git a/tests/overlay/Makefile b/tests/overlay/Makefile new file mode 100644 index 0000000..63c9878 --- /dev/null +++ b/tests/overlay/Makefile @@ -0,0 +1,20 @@ +# +# Copyright (c) 2016 Red Hat Inc. All Rights Reserved. +# + +TOPDIR = ../.. +include $(TOPDIR)/include/builddefs + +OVERLAY_DIR = overlay +TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(OVERLAY_DIR) + +include $(BUILDRULES) + +install: + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 644 group $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + +# Nothing. +install-dev install-lib: diff --git a/tests/overlay/group b/tests/overlay/group new file mode 100644 index 0000000..5056c3b --- /dev/null +++ b/tests/overlay/group @@ -0,0 +1,6 @@ +# QA groups control file +# Defines test groups and nominal group owners +# - do not start group names with a digit +# - comment line before each group is "new" description +# +001 auto quick copyup -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] overlay: test copy up files from lower dir 2016-01-11 11:38 ` [PATCH 2/2] overlay: test copy up files from lower dir Eryu Guan @ 2016-01-11 20:31 ` Dave Chinner 2016-01-12 3:46 ` Eryu Guan 0 siblings, 1 reply; 6+ messages in thread From: Dave Chinner @ 2016-01-11 20:31 UTC (permalink / raw) To: Eryu Guan; +Cc: fstests, linux-unionfs On Mon, Jan 11, 2016 at 07:38:21PM +0800, Eryu Guan wrote: > Test copy up files from lower dir that are <, =, > 4G in size. > > Kernel commit 0480334fa604 ("ovl: use O_LARGEFILE in ovl_copy_up()") > fixed bug when copying up large file(>4G) from lower dir. > > Signed-off-by: Eryu Guan <eguan@redhat.com> > --- > tests/overlay/001 | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/overlay/001.out | 2 ++ > tests/overlay/Makefile | 20 +++++++++++++ > tests/overlay/group | 6 ++++ > 4 files changed, 104 insertions(+) > create mode 100755 tests/overlay/001 > create mode 100644 tests/overlay/001.out > create mode 100644 tests/overlay/Makefile > create mode 100644 tests/overlay/group > > diff --git a/tests/overlay/001 b/tests/overlay/001 > new file mode 100755 > index 0000000..5025a69 > --- /dev/null > +++ b/tests/overlay/001 > @@ -0,0 +1,76 @@ > +#! /bin/bash > +# FS QA Test 002 002 != 001 ;) > +_scratch_mkfs > + > +# Create test files with different sizes in lower dir > +# $SCRATCH_DEV is actually a test dir used in overlay testing > +mkdir -p $SCRATCH_DEV/lower This needs to matchup with the overlay configuration. Perhaps there needs to be exported variables for this.... Cheers, Dave. -- Dave Chinner david@fromorbit.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] overlay: test copy up files from lower dir 2016-01-11 20:31 ` Dave Chinner @ 2016-01-12 3:46 ` Eryu Guan 2016-01-12 4:06 ` Dave Chinner 0 siblings, 1 reply; 6+ messages in thread From: Eryu Guan @ 2016-01-12 3:46 UTC (permalink / raw) To: Dave Chinner; +Cc: fstests, linux-unionfs On Tue, Jan 12, 2016 at 07:31:35AM +1100, Dave Chinner wrote: > On Mon, Jan 11, 2016 at 07:38:21PM +0800, Eryu Guan wrote: > > Test copy up files from lower dir that are <, =, > 4G in size. > > > > Kernel commit 0480334fa604 ("ovl: use O_LARGEFILE in ovl_copy_up()") > > fixed bug when copying up large file(>4G) from lower dir. > > > > Signed-off-by: Eryu Guan <eguan@redhat.com> > > --- > > tests/overlay/001 | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/overlay/001.out | 2 ++ > > tests/overlay/Makefile | 20 +++++++++++++ > > tests/overlay/group | 6 ++++ > > 4 files changed, 104 insertions(+) > > create mode 100755 tests/overlay/001 > > create mode 100644 tests/overlay/001.out > > create mode 100644 tests/overlay/Makefile > > create mode 100644 tests/overlay/group > > > > diff --git a/tests/overlay/001 b/tests/overlay/001 > > new file mode 100755 > > index 0000000..5025a69 > > --- /dev/null > > +++ b/tests/overlay/001 > > @@ -0,0 +1,76 @@ > > +#! /bin/bash > > +# FS QA Test 002 > > 002 != 001 ;) Ah, I missed that after "mv 002 001".. > > > +_scratch_mkfs > > + > > +# Create test files with different sizes in lower dir > > +# $SCRATCH_DEV is actually a test dir used in overlay testing > > +mkdir -p $SCRATCH_DEV/lower > > This needs to matchup with the overlay configuration. Perhaps there > needs to be exported variables for this.... Makes sense. I thought about it too but didn't go any further, but will now. Thanks for the review! Eryu ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] overlay: test copy up files from lower dir 2016-01-12 3:46 ` Eryu Guan @ 2016-01-12 4:06 ` Dave Chinner 2016-01-12 9:34 ` Darrick J. Wong 0 siblings, 1 reply; 6+ messages in thread From: Dave Chinner @ 2016-01-12 4:06 UTC (permalink / raw) To: Eryu Guan; +Cc: fstests, linux-unionfs On Tue, Jan 12, 2016 at 11:46:33AM +0800, Eryu Guan wrote: > On Tue, Jan 12, 2016 at 07:31:35AM +1100, Dave Chinner wrote: > > On Mon, Jan 11, 2016 at 07:38:21PM +0800, Eryu Guan wrote: > > > Test copy up files from lower dir that are <, =, > 4G in size. > > > > > > Kernel commit 0480334fa604 ("ovl: use O_LARGEFILE in ovl_copy_up()") > > > fixed bug when copying up large file(>4G) from lower dir. > > > > > > Signed-off-by: Eryu Guan <eguan@redhat.com> > > > --- > > > tests/overlay/001 | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > > tests/overlay/001.out | 2 ++ > > > tests/overlay/Makefile | 20 +++++++++++++ > > > tests/overlay/group | 6 ++++ > > > 4 files changed, 104 insertions(+) > > > create mode 100755 tests/overlay/001 > > > create mode 100644 tests/overlay/001.out > > > create mode 100644 tests/overlay/Makefile > > > create mode 100644 tests/overlay/group > > > > > > diff --git a/tests/overlay/001 b/tests/overlay/001 > > > new file mode 100755 > > > index 0000000..5025a69 > > > --- /dev/null > > > +++ b/tests/overlay/001 > > > @@ -0,0 +1,76 @@ > > > +#! /bin/bash > > > +# FS QA Test 002 > > > > 002 != 001 ;) > > Ah, I missed that after "mv 002 001".. "tools/mvtest overlay/002 overlay/001" will do all that stuff for you now. When I get an updated sort script from Darrick, it will even update the group files correctly.... Cheers, Dave. -- Dave Chinner david@fromorbit.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] overlay: test copy up files from lower dir 2016-01-12 4:06 ` Dave Chinner @ 2016-01-12 9:34 ` Darrick J. Wong 0 siblings, 0 replies; 6+ messages in thread From: Darrick J. Wong @ 2016-01-12 9:34 UTC (permalink / raw) To: Dave Chinner, darrick.wong; +Cc: Eryu Guan, fstests, linux-unionfs On Tue, Jan 12, 2016 at 03:06:27PM +1100, Dave Chinner wrote: > On Tue, Jan 12, 2016 at 11:46:33AM +0800, Eryu Guan wrote: > > On Tue, Jan 12, 2016 at 07:31:35AM +1100, Dave Chinner wrote: > > > On Mon, Jan 11, 2016 at 07:38:21PM +0800, Eryu Guan wrote: > > > > Test copy up files from lower dir that are <, =, > 4G in size. > > > > > > > > Kernel commit 0480334fa604 ("ovl: use O_LARGEFILE in ovl_copy_up()") > > > > fixed bug when copying up large file(>4G) from lower dir. > > > > > > > > Signed-off-by: Eryu Guan <eguan@redhat.com> > > > > --- > > > > tests/overlay/001 | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > > > tests/overlay/001.out | 2 ++ > > > > tests/overlay/Makefile | 20 +++++++++++++ > > > > tests/overlay/group | 6 ++++ > > > > 4 files changed, 104 insertions(+) > > > > create mode 100755 tests/overlay/001 > > > > create mode 100644 tests/overlay/001.out > > > > create mode 100644 tests/overlay/Makefile > > > > create mode 100644 tests/overlay/group > > > > > > > > diff --git a/tests/overlay/001 b/tests/overlay/001 > > > > new file mode 100755 > > > > index 0000000..5025a69 > > > > --- /dev/null > > > > +++ b/tests/overlay/001 > > > > @@ -0,0 +1,76 @@ > > > > +#! /bin/bash > > > > +# FS QA Test 002 > > > > > > 002 != 001 ;) > > > > Ah, I missed that after "mv 002 001".. > > "tools/mvtest overlay/002 overlay/001" will do all that stuff for > you now. When I get an updated sort script from Darrick, it will > even update the group files correctly.... tools/mvtest looks for tools/sort-group.py but the cmd is tools/sort-group. D'oh!! --D > > Cheers, > > Dave. > -- > Dave Chinner > david@fromorbit.com > -- > 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] 6+ messages in thread
end of thread, other threads:[~2016-01-12 9:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-11 11:38 [PATCH 1/2] common: remove all files in $SCRATCH_DEV for overlayfs in _scratch_cleanup_files() Eryu Guan 2016-01-11 11:38 ` [PATCH 2/2] overlay: test copy up files from lower dir Eryu Guan 2016-01-11 20:31 ` Dave Chinner 2016-01-12 3:46 ` Eryu Guan 2016-01-12 4:06 ` Dave Chinner 2016-01-12 9:34 ` Darrick J. Wong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox