common/rc: filter out extra mount error
PATCH 1/1 common/rc: filter out extra mount error
The lastest mount command (from util-linux) merged below commit:
79534c0d7e0f ("mount: add hint about dmesg(8) to error messages")
which brought in a new error output when mount fails.
That cause some cases (e.g. xfs/005) fail as:
mount: Structure needs cleaning
dmesg(1) may have more information after failed mount system call
More failed cases like generic/050, ext4/002, xfs/154, etc ...
---
Due to _try_scratch_mount is call in many places, so I'm not sure if it's good to filter this message in _try_scratch_mount. Maybe better to filter it in each failed cases? Or write another function (e.g. _try_scratch_mount_fail) ? Welcome review points.
Thanks,
Zorro
common/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
common/rc +2 -1
@@ -335,7 +335,8 @@ _try_scratch_mount() _overlay_scratch_mount $* return $? fi - _mount -t $FSTYP `_scratch_mount_options $*` + _mount -t $FSTYP `_scratch_mount_options $*` 2> \ + >(grep -v "dmesg(1) may have more information after failed mount" >&2) mount_ret=$? [ $mount_ret -ne 0 ] && return $mount_ret _idmapped_mount $SCRATCH_DEV $SCRATCH_MNT
Signature · 1 line
2.31.1
Quoted 29 lines · Zorro Lang
The lastest mount command (from util-linux) merged below commit:
79534c0d7e0f("mount: add hint about dmesg(8) to error messages")
which brought in a new error output when mount fails.That cause some cases (e.g. xfs/005) fail as:
mount: Structure needs cleaning
dmesg(1) may have more information after failed mount system callMore failed cases like generic/050, ext4/002, xfs/154, etc ...
Signed-off-by Zorro Lang <[email protected]>---
Due to
_try_scratch_mountis call in many places, so I'm not sure if it's good to filter this message in_try_scratch_mount. Maybe better to filter it in each failed cases? Or write another function (e.g._try_scratch_mount_fail) ? Welcome review points.Thanks,
Zorrocommon/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)common/rc +0
-0
common/rc _try_scratch_mount() · line 339
Quoted 6 lines
common/rc +2
-1@@ -335,7 +335,8 @@ _try_scratch_mount() _overlay_scratch_mount $* return $? fi - _mount -t $FSTYP `_scratch_mount_options $*` + _mount -t $FSTYP `_scratch_mount_options $*` 2> \ + >(grep -v "dmesg(1) may have more information after failed mount" >&2)
_filter_error_mount()?
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 25 lines · Dave Chinner
Quoted 24 lines · Zorro Lang
The lastest mount command (from util-linux) merged below commit:
79534c0d7e0f("mount: add hint about dmesg(8) to error messages")
which brought in a new error output when mount fails.That cause some cases (e.g. xfs/005) fail as:
mount: Structure needs cleaning
dmesg(1) may have more information after failed mount system callMore failed cases like generic/050, ext4/002, xfs/154, etc ...
Signed-off-by Zorro Lang <[email protected]>---
Due to
_try_scratch_mountis call in many places, so I'm not sure if it's good to filter this message in_try_scratch_mount. Maybe better to filter it in each failed cases? Or write another function (e.g._try_scratch_mount_fail) ? Welcome review points.Thanks,
Zorrocommon/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 13 lines
common/rc _try_scratch_mount() · line 339
Quoted 11 lines
common/rc +2
-1@@ -335,7 +335,8 @@ _try_scratch_mount() _overlay_scratch_mount $* return $? fi - _mount -t $FSTYP `_scratch_mount_options $*` + _mount -t $FSTYP `_scratch_mount_options $*` 2> \ + >(grep -v "dmesg(1) may have more information after failed mount" >&2)
_filter_error_mount()?
OK, how about this change [1] ?
Do you think doing this "filter out" in _try_scratch_mount is better, or in each case which expects mount failures in .out file (e.g. xfs/005) ? Or a new _try_scratch_mount_fail() ?
Thanks,
Zorro
[1]
common/filter +5 -0
@@ -655,5 +655,10 @@ _filter_blkzone_report() sed -e 's/len/cap/2' } +_filter_mount_error() +{ + grep -v "dmesg(1) may have more information after failed mount" +} + # make sure this script returns success /bin/true
common/rc +2 -1
@@ -288,7 +288,8 @@ _try_scratch_mount() _overlay_scratch_mount $* return $? fi - _mount -t $FSTYP `_scratch_mount_options $*` + _mount -t $FSTYP `_scratch_mount_options $*` 2> \ + >(_filter_mount_error >&2) mount_ret=$? [ $mount_ret -ne 0 ] && return $mount_ret _idmapped_mount $SCRATCH_DEV $SCRATCH_MNT
Thanks,
Zorro
Quoted 8 lines
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 40 lines · Zorro Lang
Quoted 25 lines · Dave Chinner
Quoted 24 lines · Zorro Lang
The lastest mount command (from util-linux) merged below commit:
79534c0d7e0f("mount: add hint about dmesg(8) to error messages")
which brought in a new error output when mount fails.That cause some cases (e.g. xfs/005) fail as:
mount: Structure needs cleaning
dmesg(1) may have more information after failed mount system callMore failed cases like generic/050, ext4/002, xfs/154, etc ...
Signed-off-by Zorro Lang <[email protected]>---
Due to
_try_scratch_mountis call in many places, so I'm not sure if it's good to filter this message in_try_scratch_mount. Maybe better to filter it in each failed cases? Or write another function (e.g._try_scratch_mount_fail) ? Welcome review points.Thanks,
Zorrocommon/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Quoted 13 lines
common/rc _try_scratch_mount() · line 339
Quoted 11 lines
common/rc +2
-1@@ -335,7 +335,8 @@ _try_scratch_mount() _overlay_scratch_mount $* return $? fi - _mount -t $FSTYP `_scratch_mount_options $*` + _mount -t $FSTYP `_scratch_mount_options $*` 2> \ + >(grep -v "dmesg(1) may have more information after failed mount" >&2)
_filter_error_mount()?
Quoted 5 lines
OK, how about this change [1] ?
Do you think doing this "filter out" in
_try_scratch_mountis better, or in each case which expects mount failures in .out file (e.g. xfs/005) ? Or a new_try_scratch_mount_fail()?
I think you missed my point entirely. We already have a filter for this in common/filter because util-linux has changed it's failure message for EFSCORRUPTED several times:
# Filter a failed mount output due to EUCLEAN and USTALE, util-linux changed
# the message several times.
#
# prior to v2.21:
# mount: Structure needs cleaning
# v2.21 to v2.29:
# mount: mount <device> on <mountpoint> failed: Structure needs cleaning
# v2.30 and later:
# mount: <mountpoint>: mount(2) system call failed: Structure needs cleaning.
#
# This is also true for ESTALE error. So let's remove all the changing parts
# and keep the 'prior to v2.21' format:
# mount: Structure needs cleaning
# mount: Stale file handle
_filter_error_mount()
{
sed -e "s/mount:\(.*failed:\)/mount:/" | _filter_ending_dot
}So, capture and supress the new output via _filter_error_mount() and use that in the specific tests that are trying to mount a corrupt filesystem and capture that specific error message in their golden output....
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 43 lines · Dave Chinner
Quoted 42 lines · Zorro Lang
Quoted 25 lines · Dave Chinner
Quoted 24 lines · Zorro Lang
The lastest mount command (from util-linux) merged below commit:
79534c0d7e0f("mount: add hint about dmesg(8) to error messages")
which brought in a new error output when mount fails.That cause some cases (e.g. xfs/005) fail as:
mount: Structure needs cleaning
dmesg(1) may have more information after failed mount system callMore failed cases like generic/050, ext4/002, xfs/154, etc ...
Signed-off-by Zorro Lang <[email protected]>---
Due to
_try_scratch_mountis call in many places, so I'm not sure if it's good to filter this message in_try_scratch_mount. Maybe better to filter it in each failed cases? Or write another function (e.g._try_scratch_mount_fail) ? Welcome review points.Thanks,
Zorrocommon/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Quoted 13 lines
common/rc _try_scratch_mount() · line 339
Quoted 11 lines
common/rc +2
-1@@ -335,7 +335,8 @@ _try_scratch_mount() _overlay_scratch_mount $* return $? fi - _mount -t $FSTYP `_scratch_mount_options $*` + _mount -t $FSTYP `_scratch_mount_options $*` 2> \ + >(grep -v "dmesg(1) may have more information after failed mount" >&2)
_filter_error_mount()?OK, how about this change [1] ?
Quoted 7 lines
Quoted 3 lines
Do you think doing this "filter out" in
_try_scratch_mountis better, or in each case which expects mount failures in .out file (e.g. xfs/005) ? Or a new_try_scratch_mount_fail()?I think you missed my point entirely. We already have a filter for this in common/filter because util-linux has changed it's failure message for EFSCORRUPTED several times:
Oh, sorry, I didn't notice that there's a _filter_error_mount. I thought you hope to have one. Thanks, I'll change that function and try to find out all test cases which use mount errors as golden image.
Thanks,
Zorro
Quoted 35 lines
# Filter a failed mount output due to EUCLEAN and USTALE, util-linux changed
# the message several times. # # prior to v2.21: # mount: Structure needs cleaning # v2.21 to v2.29: # mount: mount <device> on <mountpoint> failed: Structure needs cleaning # v2.30 and later: # mount: <mountpoint>: mount(2) system call failed: Structure needs cleaning. # # This is also true for ESTALE error. So let's remove all the changing parts # and keep the 'prior to v2.21' format: # mount: Structure needs cleaning # mount: Stale file handle _filter_error_mount() { sed -e "s/mount:\(.*failed:\)/mount:/" | _filter_ending_dot }So, capture and supress the new output via
_filter_error_mount()and use that in the specific tests that are trying to mount a corrupt filesystem and capture that specific error message in their golden output....Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]