Skip to contentSkip to conversation

common/overlay: source base fs specific common file

PATCH In review Zorro Lang 2 participants 4 messages May 12, 2022 – May 13, 2022

lore
Share & tools
lore

Zorro Lang

author
#0 lore raw

PATCH 1/1 common/overlay: source base fs specific common file

When tests overlayfs, sometimes we need the underlying fs specific helpers, e.g. common/rc has:
_filesystem_timestamp_range $OVL_BASE_TEST_DEV $OVL_BASE_FSTYP

So when we source common/overlay, better to source then OVL_BASE_FSTYP too.

---

The generic/402 always fails on overlayfs as:

QA output created by 402
./common/rc: line 2441: _xfs_timestamp_range: command not found ./common/rc: line 2403: [: syntax error: '-1' unexpected ./common/rc: line 2408: [: -le: unary operator expected ./common/rc: line 2441: _xfs_timestamp_range: command not found 0;0 != 1;1
0;0 != 1;1
Silence is golden

Due to if FSTYP is overlay, we only source common/overlay file. But we still need the helpers of the underlying filesystem. So I think we need to source the common/$OVL_BASE_FSTYP in common/overlay. What do you think?

Thanks,
Zorro

 common/config  | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 common/overlay |  4 ++++
 common/rc      | 49 +----------------------------------------
 3 files changed, 64 insertions(+), 48 deletions(-)
common/config +59 -0
index efcf12e9..b4b2a8d4 100644
@@ -481,6 +481,65 @@ _fsck_opts()
 	esac
 }
 
+_source_specific_fs()
+{
+	local fs=$1
+
+	if [ -z "$fs" ];then
+		fs=$FSTYP
+	fi
+
+	case "$fs" in
+	xfs)
+		[ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
+		[ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
+		[ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
+		[ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
+		[ "$XFS_INFO_PROG" = "" ] && _fatal "xfs_info not found"
+
+		. ./common/xfs
+		;;
+	udf)
+		[ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
+		;;
+	btrfs)
+		[ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
+
+		. ./common/btrfs
+		;;
+	ext4)
+		[ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found"
+		;;
+	f2fs)
+		[ "$MKFS_F2FS_PROG" = "" ] && _fatal "mkfs.f2fs not found"
+		;;
+	nfs)
+		. ./common/nfs
+		;;
+	cifs)
+		;;
+	9p)
+		;;
+	ceph)
+		. ./common/ceph
+		;;
+	glusterfs)
+		;;
+	overlay)
+		. ./common/overlay
+		;;
+	reiser4)
+		[ "$MKFS_REISER4_PROG" = "" ] && _fatal "mkfs.reiser4 not found"
+		;;
+	pvfs2)
+		;;
+	ubifs)
+		[ "$UBIUPDATEVOL_PROG" = "" ] && _fatal "ubiupdatevol not found"
+		;;
+	esac
+}
+
+
 known_hosts()
 {
 	[ "$HOST_CONFIG_DIR" ] || HOST_CONFIG_DIR=`pwd`/configs
common/overlay +4 -0
index fff67ba1..4708d393 100644
@@ -12,6 +12,10 @@ export OVL_XATTR_NLINK="trusted.overlay.nlink"
 export OVL_XATTR_UPPER="trusted.overlay.upper"
 export OVL_XATTR_METACOPY="trusted.overlay.metacopy"
 
+if [ -n "$OVL_BASE_FSTYP" ];then
+	_source_specific_fs $OVL_BASE_FSTYP
+fi
+
 # helper function to do the actual overlayfs mount operation
 _overlay_mount_dirs()
 {
common/rc +1 -48

55 lines not on this page · raw message

Signature · 1 line
2.31.1
#1 lore raw
Quoted 22 lines · Zorro Lang

When tests overlayfs, sometimes we need the underlying fs specific helpers, e.g. common/rc has:
_filesystem_timestamp_range $OVL_BASE_TEST_DEV $OVL_BASE_FSTYP

So when we source common/overlay, better to source then OVL_BASE_FSTYP too.

---

The generic/402 always fails on overlayfs as:

QA output created by 402
./common/rc: line 2441: _xfs_timestamp_range: command not found ./common/rc: line 2403: [: syntax error: '-1' unexpected ./common/rc: line 2408: [: -le: unary operator expected ./common/rc: line 2441: _xfs_timestamp_range: command not found 0;0 != 1;1
0;0 != 1;1
Silence is golden

Quoted 3 lines

Due to if FSTYP is overlay, we only source common/overlay file. But we still need the helpers of the underlying filesystem. So I think we need to source the common/$OVL_BASE_FSTYP in common/overlay. What do you think?

That makes sense.
I don't know why I have never hit this.
Maybe because I am not running with multi section config or because I am runing with kvm-xfstests runner.

Thanks,
Amir.

author
#2 lore raw
Quoted 23 lines · Amir Goldstein
Quoted 22 lines · Zorro Lang

When tests overlayfs, sometimes we need the underlying fs specific helpers, e.g. common/rc has:
_filesystem_timestamp_range $OVL_BASE_TEST_DEV $OVL_BASE_FSTYP

So when we source common/overlay, better to source then OVL_BASE_FSTYP too.

---

The generic/402 always fails on overlayfs as:

QA output created by 402
./common/rc: line 2441: _xfs_timestamp_range: command not found ./common/rc: line 2403: [: syntax error: '-1' unexpected ./common/rc: line 2408: [: -le: unary operator expected ./common/rc: line 2441: _xfs_timestamp_range: command not found 0;0 != 1;1
0;0 != 1;1
Silence is golden

Quoted 5 lines
Quoted 3 lines

Due to if FSTYP is overlay, we only source common/overlay file. But we still need the helpers of the underlying filesystem. So I think we need to source the common/$OVL_BASE_FSTYP in common/overlay. What do you think?

That makes sense.

I haven't given it enough test, hope it won't break something:)

Quoted 3 lines

I don't know why I have never hit this.
Maybe because I am not running with multi section config or because I am runing with kvm-xfstests runner.

Do you test overlay with XFS? For now, I think only xfs+overlay can reproduce this failure.

Thanks,
Zorro

Quoted 4 lines

Thanks,
Amir.

#3 lore raw
Quoted 31 lines · Zorro Lang
Quoted 23 lines · Amir Goldstein
Quoted 22 lines · Zorro Lang

When tests overlayfs, sometimes we need the underlying fs specific helpers, e.g. common/rc has:
_filesystem_timestamp_range $OVL_BASE_TEST_DEV $OVL_BASE_FSTYP

So when we source common/overlay, better to source then OVL_BASE_FSTYP too.

---

The generic/402 always fails on overlayfs as:

QA output created by 402
./common/rc: line 2441: _xfs_timestamp_range: command not found ./common/rc: line 2403: [: syntax error: '-1' unexpected ./common/rc: line 2408: [: -le: unary operator expected ./common/rc: line 2441: _xfs_timestamp_range: command not found 0;0 != 1;1
0;0 != 1;1
Silence is golden

Quoted 5 lines
Quoted 3 lines

Due to if FSTYP is overlay, we only source common/overlay file. But we still need the helpers of the underlying filesystem. So I think we need to source the common/$OVL_BASE_FSTYP in common/overlay. What do you think?

That makes sense.

Quoted 8 lines

I haven't given it enough test, hope it won't break something:)

Quoted 3 lines

I don't know why I have never hit this.
Maybe because I am not running with multi section config or because I am runing with kvm-xfstests runner.

Do you test overlay with XFS? For now, I think only xfs+overlay can reproduce this failure.

I only test xfs+overlay.
And Darrick also tests this regularly for xfs regression test, so it must be a different way in which we invoke the test.

Thanks,
Amir.