Skip to contentSkip to conversation

overlay: Test constant d_ino feature

PATCH Superseded Chandan Rajendra 2 participants 2 messages Sep 1, 2017 – Sep 2, 2017

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Chandan Rajendra

author
#0 lore raw

PATCH v3 1/1 overlay: Test constant d_ino feature

This commit adds a test to verify constant d_ino feature. The following scenarios are checked,
- Parent's (i.e. "..") d_ino must always be calculated because a pure dir can be residing inside a merged dir.
- d_ino for "." must always be calculated because the present directory can have a copy-up origin.
- Verify d_ino of '.' and '..' before and after dir becomes impure. While at it also verify if trusted.overlay.impure xattr is set/reset appropriately and invalidation of readdir cache.
- Verify copied up file's (inside a impure dir) d_ino.
- Verify d_ino values corresponding to "." and ".." entries of a pure lower dir.
- Verify d_ino of ".." entry of a merged dir.
- Verify pure lower residing in dir which has another lower layer

Signed-off-by Chandan Rajendra <[email protected]>

---
Changelog:
v2->v3:
1. Add the following new test scenarios.
- Verify d_ino of '.' and '..' before and after dir becomes impure.
- Verify copied up file's (inside a impure dir) d_ino.
2. For the "Verify pure lower residing in dir which has another lower layer" test, use sane variable names.
Once again, Thanks to Amir for his suggestions.

v1->v2:
1. Removed tests copied over from overlay/017.
2. Removed src/t_dir_ino.c.
3. Add code for testing,
- d_ino of . and .. entries of pure_lower_dir.
- d_ino of .. entry of merged_dir.
- Verify pure lower residing in dir which has another lower layer.
Thanks to Amir for suggesting these tests.

 tests/overlay/037     | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/overlay/037.out |   2 +
 tests/overlay/group   |   1 +
 3 files changed, 193 insertions(+)
 create mode 100755 tests/overlay/037
 create mode 100644 tests/overlay/037.out
tests/overlay/037 new file +190 -0
new file mode 100755
index 0000000..0ef5e74
@@ -0,0 +1,190 @@
+#! /bin/bash
+# FSQA Test No. 037
+#
+# Test constant d_ino numbers
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2017 IBM Corporation. All Rights Reserved.
+# Author: Chandan Rajendra <[email protected]>
+#
+# 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
+
+# real QA test starts here
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_test_program "af_unix"
+_require_test_program "t_dir_type"
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+
+# Create our test files.
+upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
+mkdir -p $lowerdir
+
+mkdir $lowerdir/test_dir/
+mkdir $lowerdir/test_dir/pure_lower_dir
+mkdir $lowerdir/test_dir/merged_dir
+
+touch $lowerdir/test_file
+
+_scratch_mount
+
+test_dir=$SCRATCH_MNT/test_dir/
+merged_dir=$test_dir/merged_dir
+pure_upper_dir=$merged_dir/pure_upper_dir
+
+mkdir -p $pure_upper_dir
+
+merged_dir_st_ino=$(stat -c '%i' $merged_dir)
+
+# Pure dir's parent d_ino must always be calculated because
+# it can be residing inside a merged dir.
+parent_d=$($here/src/t_dir_type $pure_upper_dir $merged_dir_st_ino)
+[[ $parent_d != ".. d" ]] && \
+	echo "Pure dir inside a merged dir: Invalid d_ino reported for .."
+
+# d_ino for "." must always be calculated because the present
+# directory can have a copy-up origin.
+current_d=$($here/src/t_dir_type $merged_dir $merged_dir_st_ino)
+[[ $current_d != ". d" ]] && echo "Merged dir: Invalid d_ino reported for ."
+
+# Verify d_ino of '.' and '..' before and after dir becomes impure.
+impure_dir=$test_dir/impure_dir
+mkdir -p $impure_dir
+
+impure_dir_st_ino=$(stat -c '%i' $impure_dir)
+impure_dir_parent_st_ino=$(stat -c '%i' $test_dir)
+
+# Before $impure_dir becomes impure
+parent_d=$($here/src/t_dir_type $impure_dir $impure_dir_parent_st_ino)
+[[ $parent_d != ".. d" ]] && echo "Before dir becomes impure: Invalid d_ino reported for .."
+
+current_d=$($here/src/t_dir_type $impure_dir $impure_dir_st_ino)
+[[ $current_d != ". d" ]] && echo "Before dir becomes impure: Invalid d_ino reported for ."
+
+chown -h 100 $SCRATCH_MNT/test_file
+test_file_st_ino=$(stat -c '%i' $SCRATCH_MNT/test_file)
+
+mv $SCRATCH_MNT/test_file $impure_dir
+
+$GETFATTR_PROG --absolute-names --dump -m trusted $upperdir/test_dir/impure_dir \
+	| grep -q -F 'trusted.overlay.impure'
+[[ $? != 0 ]] && echo "Impure directory missing impure xattr"
+
+# After $impure_dir becomes impure
+parent_d=$($here/src/t_dir_type $impure_dir $impure_dir_parent_st_ino)
+[[ $parent_d != ".. d" ]] && echo "After dir becomes impure: Invalid d_ino reported for .."
+
+current_d=$($here/src/t_dir_type $impure_dir $impure_dir_st_ino)
+[[ $current_d != ". d" ]] && echo "After dir becomes impure: Invalid d_ino reported for ."
+
+# Verify copy up file's d_ino
+file_d=$($here/src/t_dir_type $impure_dir $test_file_st_ino)
+[[ $file_d != "test_file f" ]] && \
+	echo "Impure dir: Invalid d_ino reported for entry with copy-up origin"
+
+# Make $impure_dir pure
+rm -rf $impure_dir/test_file
+
+# Verify invalidation of readdir cache
+$here/src/t_dir_type $impure_dir $test_file_st_ino
+[[ $? == 0 ]] && echo "Directory's readdir cache has stale entries"
+
+$GETFATTR_PROG --absolute-names --dump -m trusted $upperdir/test_dir/impure_dir \
+	| grep -q -F 'trusted.overlay.impure'
+[[ $? == 0 ]] && echo "Pure directory has impure xattr"
+
+# Verify d_ino values corresponding to "." and ".." entries of a
+# pure lower dir.
+parent_st_ino=$(stat -c '%i' $SCRATCH_MNT/test_dir)
+pure_lower_dir=$SCRATCH_MNT/test_dir/pure_lower_dir
+
+parent_d=$($here/src/t_dir_type $pure_lower_dir $parent_st_ino)
+[[ $parent_d != ".. d" ]] && echo "Pure lower dir: Invalid d_ino reported for .."
+
+pure_lower_dir_st_ino=$(stat -c '%i' $pure_lower_dir)
+
+current_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_dir_st_ino)
+[[ $current_d != ". d" ]] && echo "Pure lower dir: Invalid d_ino reported for ."
+
+# Verify d_ino of ".." entry of a merged dir.
+merged_dir=$SCRATCH_MNT/test_dir/merged_dir
+
+parent_d=$($here/src/t_dir_type $merged_dir $parent_st_ino)
+[[ $parent_d != ".. d" ]] && echo "Merged dir: Invalid d_ino reported for .."
+
+_scratch_unmount
+
+# Verify pure lower residing in dir which has another lower layer
+_scratch_mkfs
+
+OVL_LOWER0=${OVL_LOWER}0
+OVL_LOWER1=${OVL_LOWER}1
+
+middir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER0
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER1
+upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
+workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
+
+mkdir -p $middir
+mkdir -p $lowerdir
+mkdir -p $upperdir
+mkdir -p $workdir
+
+mkdir -p $middir/dir0
+mkdir -p $lowerdir/dir0/dir1
+
+$MOUNT_PROG -t overlay overlay -o lowerdir=$middir:$lowerdir \
+	    -o upperdir=$upperdir -o workdir=$workdir $SCRATCH_MNT
+
+# Copy up dir0
+touch $SCRATCH_MNT/dir0/test_file
+
+dir0_st_ino=$(stat -c '%i' $SCRATCH_MNT/dir0)
+
+parent_d=$($here/src/t_dir_type $SCRATCH_MNT/dir0/dir1 $dir0_st_ino)
+[[ $parent_d != ".. d" ]] && \
+	echo "Pure lower in dir which has another lower layer: Invalid d_ino reported for .."
+
+$UMOUNT_PROG $SCRATCH_MNT
+
+echo "Silence is golden"
+status=0
+exit
tests/overlay/037.out new file +2 -0
new file mode 100644
index 0000000..5c3a30a
@@ -0,0 +1,2 @@
+QA output created by 037
+Silence is golden
tests/overlay/group +1 -0
index 4cc1d74..b2460e1 100644
@@ -39,3 +39,4 @@
 034 auto quick copyup hardlink
 035 auto quick mount
 036 auto quick mount
+037 auto quick copyup
Signature · 1 line
2.9.5
#1 lore raw
Quoted 15 lines · Chandan Rajendra

This commit adds a test to verify constant d_ino feature. The following scenarios are checked,
- Parent's (i.e. "..") d_ino must always be calculated because a pure dir can be residing inside a merged dir.
- d_ino for "." must always be calculated because the present directory can have a copy-up origin.
- Verify d_ino of '.' and '..' before and after dir becomes impure. While at it also verify if trusted.overlay.impure xattr is set/reset appropriately and invalidation of readdir cache.
- Verify copied up file's (inside a impure dir) d_ino.
- Verify d_ino values corresponding to "." and ".." entries of a pure lower dir.
- Verify d_ino of ".." entry of a merged dir.
- Verify pure lower residing in dir which has another lower layer

Quoted 1 line
Signed-off-by Chandan Rajendra <[email protected]>

Chandan,

The test looks good, test coverage is very good now and I also tested that it passes with overlayfs-next.
Timing is also good with merge window coming up.
We are down to petty bash nit picking ;-) (see below)

...

Review

Quoted 3 lines

+[[ $parent_d != ".. d" ]] && \

(quoted diff) +2 -0
+       echo "Pure dir inside a merged dir: Invalid d_ino reported for .."
+

This is not incorrect for an xfstest, but I much prefer the construct [ expected condition ] || echo "condition not met"

The difference is purely semantic, but the result of this construct is success and the result of the construct you used is failure, so if it the last statement in a script of function, the overall result (failure) may be confusing.

So unless you have a strong counter argument, please fix all those constructs and be careful, this is the stage where typos sneak in... ;-)
...

tests/overlay/037 line 110

Quoted 4 lines

+$GETFATTR_PROG --absolute-names --dump -m trusted $upperdir/test_dir/impure_dir \

tests/overlay/037 new file +3 -0
+       | grep -q -F 'trusted.overlay.impure'
+[[ $? != 0 ]] && echo "Impure directory missing impure xattr"
+

How about:

$GETFATTR_PROG --absolute-names -n 'trusted.overlay.impure'

$upperdir/test_dir/impure_dir \
                > /dev/null || echo "Impure directory missing impure xattr"

...

tests/overlay/037 line 133

Quoted 5 lines
tests/overlay/037 new file +5 -0
+
+$GETFATTR_PROG --absolute-names --dump -m trusted $upperdir/test_dir/impure_dir \
+       | grep -q -F 'trusted.overlay.impure'
+[[ $? == 0 ]] && echo "Pure directory has impure xattr"
+

IMO, here its fine to use && echo "Pure directory has impure xattr" but grep is also not needed.

...

Quoted 8 lines
tests/overlay/037 new file +8 -0
+# Verify pure lower residing in dir which has another lower layer
+_scratch_mkfs
+
+OVL_LOWER0=${OVL_LOWER}0
+OVL_LOWER1=${OVL_LOWER}1
+
+middir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER0
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER1

tests/overlay/037 line 172

Quoted 10 lines
tests/overlay/037 new file +10 -0
+upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
+workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
+
+mkdir -p $middir
+mkdir -p $lowerdir
+mkdir -p $upperdir
+mkdir -p $workdir
+
+mkdir -p $middir/dir0
+mkdir -p $lowerdir/dir0/dir1

instead of dir0/dir1,
mkdir $lowerdir/test_dir/
mkdir $lowerdir/test_dir/pure_lower_dir

and then use same variable names use use in first part of the test will make this part of the test easier to understand.

Cheers,
Amir.