| Message ID | 20171114123310.25286-3-eguan@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Nov 14, 2017 at 2:33 PM, Eryu Guan <eguan@redhat.com> wrote: > util-linux v2.30 changed error message of a busy mount and caused > overlay/036 to fail. e.g. > > - mount: <device> is already mounted or <mountpoint> busy > + mount: <mountpoint>: <device> already mounted or mount point busy. > > Filter the mount output by a newly introduced _filter_busy_mount > into a unified format. > > Signed-off-by: Eryu Guan <eguan@redhat.com> > --- > common/filter | 12 ++++++++++++ > tests/overlay/036 | 4 ++-- > tests/overlay/036.out | 4 ++-- > 3 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/common/filter b/common/filter > index d1bb94818e3d..b1cd558ab0e1 100644 > --- a/common/filter > +++ b/common/filter > @@ -420,6 +420,18 @@ _filter_error_mount() > sed -e "s/mount:\(.*failed:\)/mount:/" | _filter_ending_dot > } > > +# Similar to _filter_error_mount, filter a busy mount output. > +# Turn both old (prior to util-linux v2.30) and new (v2.30 and later) format to > +# a simple one. e.g. > +# old: mount: <device> is already mounted or <mountpoint> busy > +# new: mount: <mountpoint>: <device> already mounted or mount point busy. > +# filtered: mount: <device> already mounted or mount point busy > +_filter_busy_mount() > +{ > + sed -e "s/.*: \([^ ]*\).* already mounted.*busy/mount: \1 already mounted or mount point busy/" | \ > + _filter_ending_dot Same comment as for romount error. Please canonicalize output to: "mount: block device already mounted or mount point busy" so we can do away with _filter_scratch. _filter_scratch is not needed for overlay/036, but that is not the common case. And a nit: I would keep the word "or" in the left side. "already mounted or .*busy" is a nicer expression to read IMO. Amir. -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/filter b/common/filter index d1bb94818e3d..b1cd558ab0e1 100644 --- a/common/filter +++ b/common/filter @@ -420,6 +420,18 @@ _filter_error_mount() sed -e "s/mount:\(.*failed:\)/mount:/" | _filter_ending_dot } +# Similar to _filter_error_mount, filter a busy mount output. +# Turn both old (prior to util-linux v2.30) and new (v2.30 and later) format to +# a simple one. e.g. +# old: mount: <device> is already mounted or <mountpoint> busy +# new: mount: <mountpoint>: <device> already mounted or mount point busy. +# filtered: mount: <device> already mounted or mount point busy +_filter_busy_mount() +{ + sed -e "s/.*: \([^ ]*\).* already mounted.*busy/mount: \1 already mounted or mount point busy/" | \ + _filter_ending_dot +} + _filter_od() { BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT) diff --git a/tests/overlay/036 b/tests/overlay/036 index 544d4e4eaa87..e0c13ae88c92 100755 --- a/tests/overlay/036 +++ b/tests/overlay/036 @@ -103,12 +103,12 @@ _overlay_mount_dirs $lowerdir2 $upperdir2 $workdir \ # Try to mount another overlay with the same upperdir # with index=on - expect EBUSY _overlay_mount_dirs $lowerdir2 $upperdir $workdir2 \ - overlay2 $SCRATCH_MNT -oindex=on 2>&1 | _filter_scratch + overlay2 $SCRATCH_MNT -oindex=on 2>&1 | _filter_busy_mount # Try to mount another overlay with the same workdir # with index=on - expect EBUSY _overlay_mount_dirs $lowerdir2 $upperdir2 $workdir \ - overlay3 $SCRATCH_MNT -oindex=on 2>&1 | _filter_scratch + overlay3 $SCRATCH_MNT -oindex=on 2>&1 | _filter_busy_mount # success, all done diff --git a/tests/overlay/036.out b/tests/overlay/036.out index 51746114db1c..fbe224e1bac7 100644 --- a/tests/overlay/036.out +++ b/tests/overlay/036.out @@ -1,3 +1,3 @@ QA output created by 036 -mount: overlay2 is already mounted or SCRATCH_MNT busy -mount: overlay3 is already mounted or SCRATCH_MNT busy +mount: overlay2 already mounted or mount point busy +mount: overlay3 already mounted or mount point busy
util-linux v2.30 changed error message of a busy mount and caused overlay/036 to fail. e.g. - mount: <device> is already mounted or <mountpoint> busy + mount: <mountpoint>: <device> already mounted or mount point busy. Filter the mount output by a newly introduced _filter_busy_mount into a unified format. Signed-off-by: Eryu Guan <eguan@redhat.com> --- common/filter | 12 ++++++++++++ tests/overlay/036 | 4 ++-- tests/overlay/036.out | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-)