| Message ID | 20200414023105.28261-1-cgxu519@mykernel.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] overlay/072: test for whiteout inode sharing | expand |
On Tue, Apr 14, 2020 at 5:31 AM Chengguang Xu <cgxu519@mykernel.net> wrote: > > This is a test for whiteout inode sharing feature. > > Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> > --- > v1->v2: > - Address Amir's comments in v1. Looks good. Some nits. With those fixed you may add: Reviewed-by: Amir Goldstein <amir73il@gmail.com> > > common/module | 9 +++ > tests/overlay/072 | 148 ++++++++++++++++++++++++++++++++++++++++++ > tests/overlay/072.out | 2 + > tests/overlay/group | 1 + > 4 files changed, 160 insertions(+) > create mode 100755 tests/overlay/072 > create mode 100644 tests/overlay/072.out > > diff --git a/common/module b/common/module > index 39e4e793..148e8c8f 100644 > --- a/common/module > +++ b/common/module > @@ -81,3 +81,12 @@ _get_fs_module_param() > { > cat /sys/module/${FSTYP}/parameters/${1} 2>/dev/null > } > + # Set the value of a filesystem module parameter > + # at /sys/module/$FSTYP/parameters/$PARAM > + # > + # Usage example: > + # _set_fs_module_param param value > + _set_fs_module_param() > +{ > + echo ${2} > /sys/module/${FSTYP}/parameters/${1} 2>/dev/null > +} > diff --git a/tests/overlay/072 b/tests/overlay/072 > new file mode 100755 > index 00000000..e1244394 > --- /dev/null > +++ b/tests/overlay/072 > @@ -0,0 +1,148 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2020 Chengguang Xu <cgxu519@mykernel.net>. > +# All Rights Reserved. > +# > +# FS QA Test 072 > +# > +# This is a test for whiteout inode sharing feature. > +# > +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.* > + _set_fs_module_param $param_name $orig_param_value verify orig_param_value is not empty > +} > + > +# 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_test test partition not used > +_require_scratch > + > +param_name="whiteout_link_max" > + > +# Check overlayfs module param(whiteout_link_max) > +check_whiteout_link_max() > +{ > + orig_param_value=`_get_fs_module_param ${param_name}` > + if [ -z ${orig_param_value} ]; then > + _notrun "${FSTYP} does not support whiteout inode sharing" > + fi > +} > + > +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER > +upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER > +workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK > + > +# Make some testing files in lowerdir. > +# Argument: > +# $1: Testing file number > +make_lower_files() > +{ > + for name in `seq -s' ' ${1}` -s' ' not needed > + do > + touch $lowerdir/file${name} 1>&2 2>/dev/null &>/dev/null > + done > +} > + > +# Delete all copy-uped files in upperdir. > +make_whiteout_files() > +{ > + rm -f $SCRATCH_MNT/* 1>&2 2>/dev/null &>/dev/null > +} > + > +# Check link count of whiteout files. > +# Arguments: > +# $1: Testing file number > +# $2: Expected link count > +check_whiteout_files() > +{ > + for name in `seq -s' ' ${1}` -s' ' not needed > + do > + local real_count=`stat -c %h $upperdir/file${name} 2>/dev/null` > + if [[ ${2} != $real_count ]]; then > + echo "Expected link count is ${2} but real count is $real_count, file name is file${name}" > + fi > + done > + local tmpfile_count=`ls $workdir/work/\#* $workdir/index/\#* 2>/dev/null |wc -l 2>/dev/null` > + if [[ -n $tmpfile_count && $tmpfile_count > 1 ]]; then -n "$tmpfile_count" or you won't get desired outcome > + echo "There are more than one whiteout tmpfile in work/index dir!" > + ls -l $workdir/work/\#* $workdir/index/\#* 2>/dev/null > + fi > +} > + > +# Run test case with specific arguments. > +# Arguments: > +# $1: Maximum link count > +# $2: Testing file number > +# $3: Expected link count > +run_test_case() > +{ > + _scratch_mkfs > + _set_fs_module_param $param_name ${1} > + make_lower_files ${2} > + _scratch_mount > + make_whiteout_files > + check_whiteout_files ${2} ${3} > + _scratch_unmount > +} > + > +check_whiteout_link_max > + > +# Case1: > +# Setting whiteout_link_max=0 means whiteout files will not > +# share inode, each whiteout file will have it's own inode. > + > +link_max=0 > +file_count=10 > +link_count=1 > +run_test_case $link_max $file_count $link_count > + > +# Case2: > +# Setting whiteout_link_max=0 means whiteout files will not you mean whiteout_link_max=1 > +# share inode, each whiteout file will have it's own inode. > + > +link_max=1 > +file_count=10 > +link_count=1 > +run_test_case $link_max $file_count $link_count > + > +# Case3: > +# Setting whiteout_link_max>2 means whiteout files will share you mean whiteout_link_max>1 > +# inode and link count could up to whiteout_link_max. > + > +link_max=2 > +file_count=10 > +link_count=2 > +run_test_case $link_max $file_count $link_count > + > +# Case4: > +# Setting whiteout_link_max>2 means whiteout files will share you mean whiteout_link_max>1 Thanks, Amir.
---- 在 星期二, 2020-04-14 11:22:26 Amir Goldstein <amir73il@gmail.com> 撰写 ---- > On Tue, Apr 14, 2020 at 5:31 AM Chengguang Xu <cgxu519@mykernel.net> wrote: > > > > This is a test for whiteout inode sharing feature. > > > > Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> > > --- > > v1->v2: > > - Address Amir's comments in v1. > > Looks good. Some nits. > With those fixed you may add: > Reviewed-by: Amir Goldstein <amir73il@gmail.com> > > > > > > common/module | 9 +++ > > tests/overlay/072 | 148 ++++++++++++++++++++++++++++++++++++++++++ > > tests/overlay/072.out | 2 + > > tests/overlay/group | 1 + > > 4 files changed, 160 insertions(+) > > create mode 100755 tests/overlay/072 > > create mode 100644 tests/overlay/072.out > > > > diff --git a/common/module b/common/module > > index 39e4e793..148e8c8f 100644 > > --- a/common/module > > +++ b/common/module > > @@ -81,3 +81,12 @@ _get_fs_module_param() > > { > > cat /sys/module/${FSTYP}/parameters/${1} 2>/dev/null > > } > > + # Set the value of a filesystem module parameter > > + # at /sys/module/$FSTYP/parameters/$PARAM > > + # > > + # Usage example: > > + # _set_fs_module_param param value > > + _set_fs_module_param() > > +{ > > + echo ${2} > /sys/module/${FSTYP}/parameters/${1} 2>/dev/null > > +} > > diff --git a/tests/overlay/072 b/tests/overlay/072 > > new file mode 100755 > > index 00000000..e1244394 > > --- /dev/null > > +++ b/tests/overlay/072 > > @@ -0,0 +1,148 @@ > > +#! /bin/bash > > +# SPDX-License-Identifier: GPL-2.0 > > +# Copyright (c) 2020 Chengguang Xu <cgxu519@mykernel.net>. > > +# All Rights Reserved. > > +# > > +# FS QA Test 072 > > +# > > +# This is a test for whiteout inode sharing feature. > > +# > > +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.* > > + _set_fs_module_param $param_name $orig_param_value > > verify orig_param_value is not empty > I think if orig_param_value is empty, then test will be "not run" therefore _cleanup() will not be called. Thanks, cgxu
On Tue, Apr 14, 2020 at 7:25 AM Chengguang Xu <cgxu519@mykernel.net> wrote: > > ---- 在 星期二, 2020-04-14 11:22:26 Amir Goldstein <amir73il@gmail.com> 撰写 ---- > > On Tue, Apr 14, 2020 at 5:31 AM Chengguang Xu <cgxu519@mykernel.net> wrote: > > > > > > This is a test for whiteout inode sharing feature. > > > > > > Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> > > > --- > > > v1->v2: > > > - Address Amir's comments in v1. > > > > Looks good. Some nits. > > With those fixed you may add: > > Reviewed-by: Amir Goldstein <amir73il@gmail.com> > > > > > > > > > > common/module | 9 +++ > > > tests/overlay/072 | 148 ++++++++++++++++++++++++++++++++++++++++++ > > > tests/overlay/072.out | 2 + > > > tests/overlay/group | 1 + > > > 4 files changed, 160 insertions(+) > > > create mode 100755 tests/overlay/072 > > > create mode 100644 tests/overlay/072.out > > > > > > diff --git a/common/module b/common/module > > > index 39e4e793..148e8c8f 100644 > > > --- a/common/module > > > +++ b/common/module > > > @@ -81,3 +81,12 @@ _get_fs_module_param() > > > { > > > cat /sys/module/${FSTYP}/parameters/${1} 2>/dev/null > > > } > > > + # Set the value of a filesystem module parameter > > > + # at /sys/module/$FSTYP/parameters/$PARAM > > > + # > > > + # Usage example: > > > + # _set_fs_module_param param value > > > + _set_fs_module_param() > > > +{ > > > + echo ${2} > /sys/module/${FSTYP}/parameters/${1} 2>/dev/null > > > +} > > > diff --git a/tests/overlay/072 b/tests/overlay/072 > > > new file mode 100755 > > > index 00000000..e1244394 > > > --- /dev/null > > > +++ b/tests/overlay/072 > > > @@ -0,0 +1,148 @@ > > > +#! /bin/bash > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# Copyright (c) 2020 Chengguang Xu <cgxu519@mykernel.net>. > > > +# All Rights Reserved. > > > +# > > > +# FS QA Test 072 > > > +# > > > +# This is a test for whiteout inode sharing feature. > > > +# > > > +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.* > > > + _set_fs_module_param $param_name $orig_param_value > > > > verify orig_param_value is not empty > > > > I think if orig_param_value is empty, then test will be "not run" therefore _cleanup() will not be called. > _cleanup() is called also on exit 0 so also in case of _notrun Thanks, Amir.
diff --git a/common/module b/common/module index 39e4e793..148e8c8f 100644 --- a/common/module +++ b/common/module @@ -81,3 +81,12 @@ _get_fs_module_param() { cat /sys/module/${FSTYP}/parameters/${1} 2>/dev/null } + # Set the value of a filesystem module parameter + # at /sys/module/$FSTYP/parameters/$PARAM + # + # Usage example: + # _set_fs_module_param param value + _set_fs_module_param() +{ + echo ${2} > /sys/module/${FSTYP}/parameters/${1} 2>/dev/null +} diff --git a/tests/overlay/072 b/tests/overlay/072 new file mode 100755 index 00000000..e1244394 --- /dev/null +++ b/tests/overlay/072 @@ -0,0 +1,148 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Chengguang Xu <cgxu519@mykernel.net>. +# All Rights Reserved. +# +# FS QA Test 072 +# +# This is a test for whiteout inode sharing feature. +# +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.* + _set_fs_module_param $param_name $orig_param_value +} + +# 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_test +_require_scratch + +param_name="whiteout_link_max" + +# Check overlayfs module param(whiteout_link_max) +check_whiteout_link_max() +{ + orig_param_value=`_get_fs_module_param ${param_name}` + if [ -z ${orig_param_value} ]; then + _notrun "${FSTYP} does not support whiteout inode sharing" + fi +} + +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER +workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK + +# Make some testing files in lowerdir. +# Argument: +# $1: Testing file number +make_lower_files() +{ + for name in `seq -s' ' ${1}` + do + touch $lowerdir/file${name} 1>&2 2>/dev/null + done +} + +# Delete all copy-uped files in upperdir. +make_whiteout_files() +{ + rm -f $SCRATCH_MNT/* 1>&2 2>/dev/null +} + +# Check link count of whiteout files. +# Arguments: +# $1: Testing file number +# $2: Expected link count +check_whiteout_files() +{ + for name in `seq -s' ' ${1}` + do + local real_count=`stat -c %h $upperdir/file${name} 2>/dev/null` + if [[ ${2} != $real_count ]]; then + echo "Expected link count is ${2} but real count is $real_count, file name is file${name}" + fi + done + local tmpfile_count=`ls $workdir/work/\#* $workdir/index/\#* 2>/dev/null |wc -l 2>/dev/null` + if [[ -n $tmpfile_count && $tmpfile_count > 1 ]]; then + echo "There are more than one whiteout tmpfile in work/index dir!" + ls -l $workdir/work/\#* $workdir/index/\#* 2>/dev/null + fi +} + +# Run test case with specific arguments. +# Arguments: +# $1: Maximum link count +# $2: Testing file number +# $3: Expected link count +run_test_case() +{ + _scratch_mkfs + _set_fs_module_param $param_name ${1} + make_lower_files ${2} + _scratch_mount + make_whiteout_files + check_whiteout_files ${2} ${3} + _scratch_unmount +} + +check_whiteout_link_max + +# Case1: +# Setting whiteout_link_max=0 means whiteout files will not +# share inode, each whiteout file will have it's own inode. + +link_max=0 +file_count=10 +link_count=1 +run_test_case $link_max $file_count $link_count + +# Case2: +# Setting whiteout_link_max=0 means whiteout files will not +# share inode, each whiteout file will have it's own inode. + +link_max=1 +file_count=10 +link_count=1 +run_test_case $link_max $file_count $link_count + +# Case3: +# Setting whiteout_link_max>2 means whiteout files will share +# inode and link count could up to whiteout_link_max. + +link_max=2 +file_count=10 +link_count=2 +run_test_case $link_max $file_count $link_count + +# Case4: +# Setting whiteout_link_max>2 means whiteout files will share +# inode and link count could up to whiteout_link_max. + +link_max=10 +file_count=20 +link_count=10 +run_test_case $link_max $file_count $link_count + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/overlay/072.out b/tests/overlay/072.out new file mode 100644 index 00000000..590bbc6c --- /dev/null +++ b/tests/overlay/072.out @@ -0,0 +1,2 @@ +QA output created by 072 +Silence is golden diff --git a/tests/overlay/group b/tests/overlay/group index 43ad8a52..8b2276f1 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -74,3 +74,4 @@ 069 auto quick copyup hardlink exportfs nested nonsamefs 070 auto quick copyup redirect nested 071 auto quick copyup redirect nested nonsamefs +072 auto quick whiteout
This is a test for whiteout inode sharing feature. Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> --- v1->v2: - Address Amir's comments in v1. common/module | 9 +++ tests/overlay/072 | 148 ++++++++++++++++++++++++++++++++++++++++++ tests/overlay/072.out | 2 + tests/overlay/group | 1 + 4 files changed, 160 insertions(+) create mode 100755 tests/overlay/072 create mode 100644 tests/overlay/072.out