Add fsck.overlay test case to test it how to deal with invalid/valid redirect xattr in underlying directories of overlayfs. It should remove the invalid redirect dir xattr automatically and keep the valid one. Signed-off-by: zhangyi (F) <yi.zhang@xxxxxxxxxx> --- tests/overlay/203 | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/203.out | 8 +++ tests/overlay/group | 1 + 3 files changed, 194 insertions(+) create mode 100755 tests/overlay/203 create mode 100644 tests/overlay/203.out diff --git a/tests/overlay/203 b/tests/overlay/203 new file mode 100755 index 0000000..ccf1109 --- /dev/null +++ b/tests/overlay/203 @@ -0,0 +1,185 @@ +#! /bin/bash +# FS QA Test 203 +# +# Test fsck.overlay how to deal with redirect xattr in overlayfs. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Huawei. All Rights Reserved. +# Author: zhangyi (F) <yi.zhang@xxxxxxxxxx> +# +# 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 +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs overlay +_supported_os Linux +_require_scratch +_require_attrs +_require_command "$FSCK_OVERLAY_PROG" fsck.overlay + +# remove all files from previous tests +_scratch_mkfs + +OVL_REDIRECT_XATTR="trusted.overlay.redirect" +OVL_OPAQUE_XATTR="trusted.overlay.opaque" +OVL_OPAQUE_XATTR_VAL="y" + +# Set redirect xattr to a directory +set_redirect() +{ + local target=$1 + local value=$2 + + $SETFATTR_PROG -n $OVL_REDIRECT_XATTR -v $value $target +} + +# Check xattr is correct or not +check_xattr() +{ + local name=$1 + local expect=$2 + local target=$3 + + value=$($GETFATTR_PROG --absolute-names --only-values -n $name $target) + + [[ $value == $expect ]] || echo "$name xattr incorrect" +} + +# Check whiteout +check_whiteout() +{ + local target=$1 + + target_type=`stat -c "%F:%t,%T" $target` + + [[ $target_type == "character special file:0,0" ]] || \ + echo "Valid whiteout removed incorrectly" +} + +# Create test directories +lowerdir=$OVL_BASE_SCRATCH_MNT/lower +lowerdir2=$OVL_BASE_SCRATCH_MNT/lower2 +upperdir=$OVL_BASE_SCRATCH_MNT/upper +workdir=$OVL_BASE_SCRATCH_MNT/workdir + +mkdir -p $lowerdir $lowerdir2 $upperdir $workdir $workdir + +# Test invalid redirect xattr point to a nonexistent origin, should remove +echo "+ Invalid redirect" +mkdir $upperdir/testdir +set_redirect $upperdir/testdir "abc" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +$GETFATTR_PROG --absolute-names -d -m $OVL_REDIRECT_XATTR $upperdir/testdir +rm -rf $upperdir/* + +# Test invalid redirect xattr point to a file origin, should remove +echo "+ Invalid redirect(2)" +touch $lowerdir/origin +mkdir $upperdir/testdir +set_redirect $upperdir/testdir "origin" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +$GETFATTR_PROG --absolute-names -d -m $OVL_REDIRECT_XATTR $upperdir/testdir +rm -rf $lowerdir/* $upperdir/* + +# Test valid redirect xattr point to a directory origin in the same directory, +# should not remove +echo "+ Valid redirect" +mkdir $lowerdir/origin +mknod $upperdir/origin c 0 0 +mkdir $upperdir/testdir +set_redirect $upperdir/testdir "origin" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +check_xattr $OVL_REDIRECT_XATTR "origin" $upperdir/testdir +rm -rf $lowerdir/* $upperdir/* + +# Test valid redirect xattr point to a directory origin in different directories +# should not remove +echo "+ Valid redirect(2)" +mkdir $lowerdir/origin +mknod $upperdir/origin c 0 0 +mkdir -p $upperdir/testdir1/testdir2 +set_redirect $upperdir/testdir1/testdir2 "/origin" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +check_xattr $OVL_REDIRECT_XATTR "/origin" $upperdir/testdir1/testdir2 +rm -rf $lowerdir/* $upperdir/* + +# Test missing whiteout with valid redirect directory, should fix whiteout +echo "+ Missing whiteout" +mkdir $lowerdir/origin +mkdir $upperdir/testdir +set_redirect $upperdir/testdir "origin" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +check_xattr $OVL_REDIRECT_XATTR "origin" $upperdir/testdir +check_whiteout $upperdir/origin +rm -rf $lowerdir/* $upperdir/* + +# Test missing opaque xattr with valid redirect directory, should fix opaque +echo "+ Missing opaque" +mkdir $lowerdir/origin +mkdir $upperdir/origin +mkdir $upperdir/testdir +set_redirect $upperdir/testdir "origin" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +check_xattr $OVL_REDIRECT_XATTR "origin" $upperdir/testdir +check_xattr $OVL_OPAQUE_XATTR $OVL_OPAQUE_XATTR_VAL $upperdir/origin +rm -rf $lowerdir/* $upperdir/* + +# Test duplicate redirect directories point to one origin, should fail in +# -a 'auto' mode, should remove the duplicate one in -y 'yes' mode +echo "+ Duplicate redirect" +mkdir $lowerdir/origin +mknod $upperdir/origin c 0 0 +mkdir $upperdir/testdir1 +mkdir $upperdir/testdir2 +set_redirect $upperdir/testdir1 "origin" +set_redirect $upperdir/testdir2 "origin" +_overlay_fsck_dirs -a $lowerdir $upperdir $workdir >> $seqres.full 2>&1 && \ + _fail "fsck should fail" +_overlay_fsck_dirs -y $lowerdir $upperdir $workdir >> $seqres.full 2>&1 || \ + _fail "fsck should not fail" +check_xattr $OVL_REDIRECT_XATTR "origin" $upperdir/testdir2 + +# success, all done +status=0 +exit diff --git a/tests/overlay/203.out b/tests/overlay/203.out new file mode 100644 index 0000000..3f8155d --- /dev/null +++ b/tests/overlay/203.out @@ -0,0 +1,8 @@ +QA output created by 203 ++ Invalid redirect ++ Invalid redirect(2) ++ Valid redirect ++ Valid redirect(2) ++ Missing whiteout ++ Missing opaque ++ Duplicate redirect diff --git a/tests/overlay/group b/tests/overlay/group index e39b5e0..f99d89e 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -51,3 +51,4 @@ 048 auto quick copyup hardlink 201 auto quick fsck 202 auto quick fsck +203 auto quick fsck -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html