vendor: moby/sys mountinfo/v0.4.0 #41458

thaJeztah · 2020-09-16T10:22:38Z

full diff: moby/sys@mountinfo/v0.1.3...mountinfo/v0.4.0

Note that this dependency uses submodules, providing "github.com/moby/sys/mount"
and "github.com/moby/sys/mountinfo". Our vendoring tool (vndr) currently doesn't
support submodules, so we vendor the top-level moby/sys repository (which contains
both) and pick the most recent tag, which could be either mountinfo/vXXX or
mount/vXXX.

github.com/moby/sys/mountinfo v0.4.0

Breaking changes:

PidMountInfo is now deprecated and will be removed before v1.0; users should switch to GetMountsFromReader

Fixes and improvements:

run filter after all fields are parsed
correct handling errors from bufio.Scan
documentation formatting fixes

github.com/moby/sys/mountinfo v0.3.1

mount: use MNT_* flags from golang.org/x/sys/unix on freebsd
various godoc and CI fixes
mountinfo: make GetMountinfoFromReader Linux-specific
Add support for OpenBSD in addition to FreeBSD
mountinfo: use idiomatic naming for fields

github.com/moby/sys/mountinfo v0.2.0

Bug fixes:

Fix path unescaping for paths with double quotes

Improvements:

Mounted: speed up by adding fast paths using openat2 (Linux-only) and stat
Mounted: relax path requirements (allow relative, non-cleaned paths, symlinks)
Unescape fstype and source fields
Documentation improvements

Testing/CI:

Unit tests: exclude darwin
CI: run tests under Fedora 32 to test openat2
TestGetMounts: fix for Ubuntu build system
Makefile: fix ignoring test failures
CI: add cross build

github.com/moby/sys/mount v0.1.1

https://github.com/moby/sys/releases/tag/mount%2Fv0.1.1

Improvements:

RecursiveUnmount: add a fast path (Auto-restart processes #26)
Unmount: improve doc
fix CI linter warning on Windows

Testing/CI:

Unit tests: exclude darwin
Makefile: fix ignoring test failures
CI: add cross build

thaJeztah · 2020-09-16T10:22:58Z

@kolyshkin @cpuguy83 PTAL

thaJeztah · 2020-09-17T20:03:12Z

Ah, forgot to update x/sys;


[2020-09-16T10:25:54.222Z] vendor/github.com/moby/sys/mountinfo/mounted_linux.go:15:16: undefined: unix.Openat2
[2020-09-16T10:25:54.222Z] vendor/github.com/moby/sys/mountinfo/mounted_linux.go:15:50: undefined: unix.OpenHow
[2020-09-16T10:25:54.222Z] vendor/github.com/moby/sys/mountinfo/mounted_linux.go:24:13: undefined: unix.Openat2
[2020-09-16T10:25:54.222Z] vendor/github.com/moby/sys/mountinfo/mounted_linux.go:24:40: undefined: unix.OpenHow

kolyshkin · 2020-09-17T20:28:16Z

Once moby will switch to golang 1.15 (#40353), I hope we can finally drop vndr and use go.mod. I worked on that (switching to go modules) more than a year ago and remember that replace directive and version specification features were not flexible enough -- I think/hope this is solved by now.

thaJeztah · 2020-09-18T00:26:13Z

updated golang.org/x/sys; PTAL

thaJeztah · 2020-09-18T19:07:13Z

I opened moby/sys#31 to fix the change in behavior

kolyshkin · 2020-09-21T08:14:54Z

Looks like EnsureRemoveAll should be unix-specific, and for windows it should be an alias or wrapper of os.RemoveAll.

kolyshkin · 2020-09-21T08:26:44Z

Looks like EnsureRemoveAll should be unix-specific, and for windows it should be an alias or wrapper of os.RemoveAll.

That's what I mean: #41478

WDYT @cpuguy83 @thaJeztah?

cpuguy83 · 2020-09-21T15:31:05Z

Agreed

thaJeztah · 2020-09-21T15:52:00Z

Rebased; pls check if the remaining "stubs" for Windows look ok, or if we should refactor more to not have those in the windows codepath

kolyshkin · 2020-09-21T23:30:41Z

daemon/start.go

@@ -253,7 +252,7 @@ func (daemon *Daemon) Cleanup(container *container.Container) {
 		logrus.Warnf("%s cleanup: failed to unmount secrets: %s", container.ID, err)
 	}

-	if err := mount.RecursiveUnmount(container.Root); err != nil {


Hmm, now when I look at this line... isn't it supposed to be below container.UnmountVolumes?

cc @cpuguy83

This code was added by commit eaa5192, at that time container.UnmountVolumes was already there (below)

@cpuguy83 could you have a look?

container.Root is /var/lib/docker/containers/<id>

What about volumes? I haven't checked but I suppose volumes are mounted under the container.Root, so it makes sense to have volumes unmounted first. Or am I missing something?

Surely it's a separate issue; just wondering.

pkg/system/rm_unix.go

testutil/daemon/daemon.go

volume/local/local.go

thaJeztah · 2020-09-23T12:13:27Z

@cpuguy83 @kolyshkin PTAL <3

thaJeztah · 2020-10-06T21:32:21Z

@kolyshkin @cpuguy83 ptal

thaJeztah · 2020-10-06T21:32:39Z

Test failure is a flaky test, let me kick it

kolyshkin · 2020-10-08T00:37:36Z

volume/local/local_unix.go

+func (v *localVolume) unmount() error {
+	if v.needsMount() {
+		if err := mount.Unmount(v.path); err != nil {
+			if mounted, mErr := mountinfo.Mounted(v.path); mounted || mErr != nil {


I thought I kill all those redundant checks already... Anyway, it's a separate issue.

kolyshkin · 2020-10-08T00:40:02Z

So, maybe it's time to kill pkg/mount, rather than provide all those wrappers?

thaJeztah · 2020-10-29T21:59:23Z

So, maybe it's time to kill pkg/mount, rather than provide all those wrappers?

Yeah, so my thinking was to keep it for this release (as it's the release in which we deprecate it), then remove for the next (allowing users one release cycle to migrate)

Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/sys@mountinfo/v0.1.3...mountinfo/v0.4.0 > Note that this dependency uses submodules, providing "github.com/moby/sys/mount" > and "github.com/moby/sys/mountinfo". Our vendoring tool (vndr) currently doesn't > support submodules, so we vendor the top-level moby/sys repository (which contains > both) and pick the most recent tag, which could be either `mountinfo/vXXX` or > `mount/vXXX`. github.com/moby/sys/mountinfo v0.4.0 -------------------------------------------------------------------------------- Breaking changes: - `PidMountInfo` is now deprecated and will be removed before v1.0; users should switch to `GetMountsFromReader` Fixes and improvements: - run filter after all fields are parsed - correct handling errors from bufio.Scan - documentation formatting fixes github.com/moby/sys/mountinfo v0.3.1 -------------------------------------------------------------------------------- - mount: use MNT_* flags from golang.org/x/sys/unix on freebsd - various godoc and CI fixes - mountinfo: make GetMountinfoFromReader Linux-specific - Add support for OpenBSD in addition to FreeBSD - mountinfo: use idiomatic naming for fields github.com/moby/sys/mountinfo v0.2.0 -------------------------------------------------------------------------------- Bug fixes: - Fix path unescaping for paths with double quotes Improvements: - Mounted: speed up by adding fast paths using openat2 (Linux-only) and stat - Mounted: relax path requirements (allow relative, non-cleaned paths, symlinks) - Unescape fstype and source fields - Documentation improvements Testing/CI: - Unit tests: exclude darwin - CI: run tests under Fedora 32 to test openat2 - TestGetMounts: fix for Ubuntu build system - Makefile: fix ignoring test failures - CI: add cross build github.com/moby/sys/mount v0.1.1 -------------------------------------------------------------------------------- https://github.com/moby/sys/releases/tag/mount%2Fv0.1.1 Improvements: - RecursiveUnmount: add a fast path (moby#26) - Unmount: improve doc - fix CI linter warning on Windows Testing/CI: - Unit tests: exclude darwin - Makefile: fix ignoring test failures - CI: add cross build Signed-off-by: Sebastiaan van Stijn <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah · 2020-10-29T22:06:01Z

updated to v0.4.0

@kolyshkin @cpuguy83 @AkihiroSuda PTAL

kolyshkin

LGTM

TBBle · 2020-11-05T11:03:29Z

It seems this PR broke the Windows unit tests, and in turn revealed that the Windows CI pipeline passes if the unit tests fail, as it somehow still exits with '0'. I'm looking into this now as I wanted to add a new Windows-specific test.

thaJeztah · 2020-11-05T11:26:37Z

Arf.. we had a tracking issue for the false reports in #39576, but thought it was fixed; apparently not 😞

TBBle · 2020-11-05T11:31:42Z

I suspect the fix for #39576 fixed the integration tests, but the unit tests are exiting 1 at one point, but still seeing an exit 0 later, which is what goes to Jenkins.

thaJeztah · 2020-11-05T11:46:47Z

opened #41637 to move the parts that were undefined on windows

thaJeztah added status/2-code-review kind/refactor PR's that refactor, or clean-up code labels Sep 16, 2020

thaJeztah force-pushed the bump_mountinfo branch 2 times, most recently from 187a841 to b6b850a Compare September 18, 2020 00:25

This comment has been minimized.

Sign in to view

thaJeztah mentioned this pull request Sep 18, 2020

mount: some refactor and improved GoDoc about Windows support moby/sys#31

Merged

thaJeztah force-pushed the bump_mountinfo branch 3 times, most recently from 9240e67 to 93950b9 Compare September 19, 2020 21:18

thaJeztah requested a review from cpuguy83 as a code owner September 19, 2020 21:18

kolyshkin mentioned this pull request Sep 21, 2020

pkg/system: make EnsureRemoveAll unix-specific #41478

Merged

thaJeztah force-pushed the bump_mountinfo branch from 93950b9 to f5d72b2 Compare September 21, 2020 15:41

kolyshkin reviewed Sep 21, 2020

View reviewed changes

pkg/system/rm_unix.go Outdated Show resolved Hide resolved

kolyshkin reviewed Sep 21, 2020

View reviewed changes

testutil/daemon/daemon.go Show resolved Hide resolved

kolyshkin reviewed Sep 21, 2020

View reviewed changes

volume/local/local.go Show resolved Hide resolved

thaJeztah force-pushed the bump_mountinfo branch 3 times, most recently from cf79fd5 to da9703c Compare September 23, 2020 08:28

thaJeztah force-pushed the bump_mountinfo branch from da9703c to e082abf Compare October 6, 2020 10:54

thaJeztah mentioned this pull request Oct 7, 2020

convert users to new names in mountinfo moby/sys#42

Closed

5 tasks

thaJeztah force-pushed the bump_mountinfo branch from 2299f83 to f8b4800 Compare October 7, 2020 20:40

kolyshkin reviewed Oct 8, 2020

View reviewed changes

thaJeztah added 3 commits October 29, 2020 23:00

Do not call mount.RecursiveUnmount() on Windows

182795c

Signed-off-by: Sebastiaan van Stijn <[email protected]>

pkg/mount: update deprecated wrappers

e766361

Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah changed the title ~~vendor: moby/sys mountinfo/v0.3.1~~ vendor: moby/sys mountinfo/v0.4.0 Oct 29, 2020

thaJeztah force-pushed the bump_mountinfo branch from f8b4800 to e766361 Compare October 29, 2020 22:05

thaJeztah added this to the 20.10.0 milestone Oct 29, 2020

thaJeztah mentioned this pull request Oct 29, 2020

replace pkg/symlink with github.com/moby/sys/symlink #41606

Merged

tiborvass approved these changes Nov 2, 2020

View reviewed changes

kolyshkin approved these changes Nov 3, 2020

View reviewed changes

AkihiroSuda approved these changes Nov 3, 2020

View reviewed changes

AkihiroSuda merged commit 0b93c6e into moby:master Nov 3, 2020

thaJeztah deleted the bump_mountinfo branch November 3, 2020 10:15

thaJeztah mentioned this pull request Nov 5, 2020

pkg/mount: fix compile failure on Windows (move linux-only stubs0 #41637

Closed

TBBle mentioned this pull request Nov 5, 2020

Reinstate Windows CI Pipeline usefulness #41638

Merged

thaJeztah mentioned this pull request Nov 10, 2020

testutil: remove remaining use of deprecated pkg/mount #41658

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

vendor: moby/sys mountinfo/v0.4.0 #41458

vendor: moby/sys mountinfo/v0.4.0 #41458

thaJeztah commented Sep 16, 2020 •

edited

Loading

thaJeztah commented Sep 16, 2020

thaJeztah commented Sep 17, 2020

kolyshkin commented Sep 17, 2020

thaJeztah commented Sep 18, 2020

This comment has been minimized.

thaJeztah commented Sep 18, 2020

kolyshkin commented Sep 21, 2020

kolyshkin commented Sep 21, 2020

cpuguy83 commented Sep 21, 2020

thaJeztah commented Sep 21, 2020

kolyshkin Sep 21, 2020

kolyshkin Sep 21, 2020

thaJeztah Sep 23, 2020

cpuguy83 Oct 6, 2020

kolyshkin Oct 8, 2020

thaJeztah commented Sep 23, 2020

thaJeztah commented Oct 6, 2020

thaJeztah commented Oct 6, 2020

kolyshkin Oct 8, 2020

kolyshkin commented Oct 8, 2020

thaJeztah commented Oct 29, 2020

thaJeztah commented Oct 29, 2020

kolyshkin left a comment

TBBle commented Nov 5, 2020

thaJeztah commented Nov 5, 2020

TBBle commented Nov 5, 2020

thaJeztah commented Nov 5, 2020

vendor: moby/sys mountinfo/v0.4.0 #41458

vendor: moby/sys mountinfo/v0.4.0 #41458

Conversation

thaJeztah commented Sep 16, 2020 • edited Loading

github.com/moby/sys/mountinfo v0.4.0

github.com/moby/sys/mountinfo v0.3.1

github.com/moby/sys/mountinfo v0.2.0

github.com/moby/sys/mount v0.1.1

thaJeztah commented Sep 16, 2020

thaJeztah commented Sep 17, 2020

kolyshkin commented Sep 17, 2020

thaJeztah commented Sep 18, 2020

This comment has been minimized.

thaJeztah commented Sep 18, 2020

kolyshkin commented Sep 21, 2020

kolyshkin commented Sep 21, 2020

cpuguy83 commented Sep 21, 2020

thaJeztah commented Sep 21, 2020

kolyshkin Sep 21, 2020

Choose a reason for hiding this comment

kolyshkin Sep 21, 2020

Choose a reason for hiding this comment

thaJeztah Sep 23, 2020

Choose a reason for hiding this comment

cpuguy83 Oct 6, 2020

Choose a reason for hiding this comment

kolyshkin Oct 8, 2020

Choose a reason for hiding this comment

thaJeztah commented Sep 23, 2020

thaJeztah commented Oct 6, 2020

thaJeztah commented Oct 6, 2020

kolyshkin Oct 8, 2020

Choose a reason for hiding this comment

kolyshkin commented Oct 8, 2020

thaJeztah commented Oct 29, 2020

thaJeztah commented Oct 29, 2020

kolyshkin left a comment

Choose a reason for hiding this comment

TBBle commented Nov 5, 2020

thaJeztah commented Nov 5, 2020

TBBle commented Nov 5, 2020

thaJeztah commented Nov 5, 2020

thaJeztah commented Sep 16, 2020 •

edited

Loading