* [PATCH v2 2/3] common: export overlay lower/upper/work directories as variables
2016-01-12 8:30 [PATCH v2 1/3] common: remove all files in $SCRATCH_DEV for overlayfs in _scratch_cleanup_files() Eryu Guan
@ 2016-01-12 8:30 ` Eryu Guan
2016-01-12 8:30 ` [PATCH v2 3/3] overlay: test copy up files from lower dir Eryu Guan
1 sibling, 0 replies; 3+ messages in thread
From: Eryu Guan @ 2016-01-12 8:30 UTC (permalink / raw)
To: fstests; +Cc: linux-unionfs, Eryu Guan
This turns hard coded lower/upper/work dir names to configurable
variables.
Suggested-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
This is new patch for v2 of this series.
common/config | 3 +++
common/rc | 14 +++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/common/config b/common/config
index 9aa06a3..079e831 100644
--- a/common/config
+++ b/common/config
@@ -77,6 +77,9 @@ export XFS_MKFS_OPTIONS=${XFS_MKFS_OPTIONS:=-bsize=4096}
export TIME_FACTOR=${TIME_FACTOR:=1}
export LOAD_FACTOR=${LOAD_FACTOR:=1}
export DEBUGFS_MNT=${DEBUGFS_MNT:="/sys/kernel/debug"}
+export OVERLAY_UPPER_DIR=${OVERLAY_UPPER_DIR:="upper"}
+export OVERLAY_LOWER_DIR=${OVERLAY_LOWER_DIR:="lower"}
+export OVERLAY_WORK_DIR=${OVERLAY_WORK_DIR:="work"}
export PWD=`pwd`
#export DEBUG=${DEBUG:=...} # arbitrary CFLAGS really.
diff --git a/common/rc b/common/rc
index 75d1582..e3aa334 100644
--- a/common/rc
+++ b/common/rc
@@ -244,7 +244,7 @@ _common_dev_mount_options()
_overlay_basic_mount_options()
{
- echo "-o lowerdir=$1/lower,upperdir=$1/upper,workdir=$1/work"
+ echo "-o lowerdir=$1/$OVERLAY_LOWER_DIR,upperdir=$1/$OVERLAY_UPPER_DIR,workdir=$1/$OVERLAY_WORK_DIR"
}
_overlay_mount_options()
@@ -273,14 +273,14 @@ _overlay_mount()
local dir=$1
local mnt=$2
shift 2
- mkdir -p $dir/upper
- mkdir -p $dir/lower
- mkdir -p $dir/work
+ mkdir -p $dir/$OVERLAY_UPPER_DIR
+ mkdir -p $dir/$OVERLAY_LOWER_DIR
+ mkdir -p $dir/$OVERLAY_WORK_DIR
$MOUNT_PROG -t overlay $SELINUX_MOUNT_OPTIONS \
- -o lowerdir=$dir/lower \
- -o upperdir=$dir/upper \
- -o workdir=$dir/work \
+ -o lowerdir=$dir/$OVERLAY_LOWER_DIR \
+ -o upperdir=$dir/$OVERLAY_UPPER_DIR \
+ -o workdir=$dir/$OVERLAY_WORK_DIR \
$OVERLAY_MOUNT_OPTIONS $* \
$dir $mnt
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 3/3] overlay: test copy up files from lower dir
2016-01-12 8:30 [PATCH v2 1/3] common: remove all files in $SCRATCH_DEV for overlayfs in _scratch_cleanup_files() Eryu Guan
2016-01-12 8:30 ` [PATCH v2 2/3] common: export overlay lower/upper/work directories as variables Eryu Guan
@ 2016-01-12 8:30 ` Eryu Guan
1 sibling, 0 replies; 3+ messages in thread
From: Eryu Guan @ 2016-01-12 8:30 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>
---
v2:
- fix wrong test seq number
- use OVERLAY_XXX_DIR instead of hard coded dir names
- add _require_fs_space to require at least 8G free space
tests/overlay/001 | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
tests/overlay/001.out | 2 ++
tests/overlay/Makefile | 20 +++++++++++++
tests/overlay/group | 6 ++++
4 files changed, 109 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..6eae737
--- /dev/null
+++ b/tests/overlay/001
@@ -0,0 +1,81 @@
+#! /bin/bash
+# FS QA Test 001
+#
+# 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 generic
+_supported_os Linux
+_require_scratch
+
+# Remove all files from previous tests
+_scratch_mkfs
+
+# overlay copy_up doesn't deal with sparse file well, holes will be filled by
+# zeros, so at least (4G + 4G + 8k) free space is needed on $SCRATCH_DEV,
+# where $SCRATCH_DEV is actually a test dir used in overlay testing
+_require_fs_space $SCRATCH_DEV $((4*1024*1024*2 + 8))
+
+# Create test files with different sizes in lower dir
+lowerdir=$SCRATCH_DEV/$OVERLAY_LOWER_DIR
+mkdir -p $lowerdir
+touch $lowerdir/zero_size
+$XFS_IO_PROG -fc "pwrite 0 4k" $lowerdir/less_than_4g >>$seqres.full
+$XFS_IO_PROG -fc "pwrite 4294963200 4k" $lowerdir/4gfile >>$seqres.full
+$XFS_IO_PROG -fc "pwrite 4g 4k" $lowerdir/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
+
+TEST_DIR = overlay
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(TEST_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] 3+ messages in thread