vendor runc libraryv1.0.0-rc91-48-g67169a9d by tao12345666333 · Pull Request #41178 · moby/moby

tao12345666333 · 2020-07-05T14:47:58Z

~~full diff opencontainers/runc@v1.0.0-rc10...v1.0.0-rc91~~

vendor containerd 779ef60231a555f7eb9ba82b052d59b69ca2ef10 containerd/containerd@c80284d...779ef60
- containerd/fifo@ff969a5...f15a329
vendor runc 67169a9d43456ff0d5ae12b967acb8e366e2f181 opencontainers/runc@v1.0.0-rc10...67169a9
vendor bbolt v1.3.5 etcd-io/bbolt@v1.3.3...v1.3.5
- add go.mod
- fix panic: runtime error: unsafe pointer conversion (Go 1.14)
vendor prometheus dependency.
vendor protobuf v1.3.5 golang/protobuf@v1.3.3...v1.3.5
- ptypes: regenerate with v3.11.4, update for go1.14 gofmt
- go.mod: set go version to go1.9

AkihiroSuda

Please update containerd together

vendor.conf

tao12345666333 · 2020-07-06T07:53:41Z

When start the container with --privileged, an error will occur, I will check tonight.

thaJeztah · 2020-07-06T10:15:50Z

daemon/stats/collector_unix.go

Perhaps this should now just be a const clockTicksPerSecond (grouped with the nanoSecondsPerSecond below), and then we can remove the clockTicksPerSecond property, and platformNewStatsCollector().

I think this change would make sense as a separate commit (or even a separate PR)

cpuguy83

LGTM

cpuguy83 · 2020-07-07T22:50:47Z

Lots of failures, though. :(

tao12345666333 · 2020-07-07T23:11:50Z

The error is now at https://github.com/tao12345666333/moby/blob/update-runc-to-v1.0.0-rc91/libcontainerd/remote/client.go#L247

thaJeztah · 2020-07-08T10:55:14Z

Opened #41186 to address #41178 (comment)

tao12345666333 · 2020-07-10T08:01:26Z

I found that the final error message comes from
https://github.com/opencontainers/runc/blob/v1.0.0-rc91/libcontainer/rootfs_linux.go#L654-L656

The unix.Mknod method returned an invalid argument error.

I checked the value it got, e.g.

dest:/var/lib/docker/overlay2/f91757214cfde0ac98dbb16bc3d24e358fbea3f7cf47914ebc1f90d539687be6/merged/dev/core
fileMode: -rwxrwxrwx
dev: 0

node: {"type":99,"major":0, "minor":0,"permissions":"","allow":false,"path":"/dev/core","file_mode":41471,"uid":0,"gid":0}

Checking.

thaJeztah · 2020-07-10T10:52:14Z

I think we need #41016 as well

tao12345666333 · 2020-07-10T17:01:47Z

I think we need #41016 as well

Thanks. Let me take a look.

tao12345666333 · 2020-07-10T18:26:48Z

I think we need #41016 as well

Thanks. Let me take a look.

I tried to merge it in and test it locally. But the error encountered here still exists.
I need to keep checking this issue.

Doesn't work

thaJeztah · 2020-07-16T18:29:08Z

#41016 was merged; could you rebase the PR (to check if it helps with the failures)

tao12345666333 · 2020-07-17T01:19:40Z

sure!

tao12345666333 · 2020-07-18T17:49:15Z

The problem still exists, when the --privileged is passed, the container cannot be started normally.

Even if I upgrade containerd to v1.4.0 (#40982 ), the problem is the same.
I will spend time next week to continue this/

AkihiroSuda · 2020-07-24T07:22:36Z

needs rebase

thaJeztah · 2020-07-29T12:10:39Z

opened #41288

tao12345666333 · 2020-07-29T12:23:15Z

👌 Thanks

vendor.conf

tao12345666333 · 2020-07-30T07:27:38Z

CI passed 👍

thaJeztah

left some comments on other dependencies; I can try having a look at opening separate PR's for those (in case we want to cherry-pick those to the 19.03 release branch)

thaJeztah · 2020-07-30T08:20:02Z

vendor/github.com/containerd/cgroups/utils.go

Should we have the containerd/cgroups in a separate PR / commit, so that we can cherry-pick this fix for Go 1.14 in the 19.03 branch @AkihiroSuda ?

let's just merge #41253 and we will have the latest containerd/cgroups

Ah, yes, forgot that one was updating it; merged it

thaJeztah · 2020-07-30T08:23:29Z

vendor/github.com/containerd/containerd/vendor.conf

Looks like we need to update this one as well (perhaps also separate because IIRC, this is to fix issues with Go 1.14); containerd/containerd#4334

OK, I create a separate commit. (Will push soon)

thaJeztah · 2020-07-30T08:26:21Z

vendor/github.com/containerd/containerd/vendor.conf

I need to have a look at getting these update in moby

moby/vendor.conf

Lines 116 to 122 in a072d72

# gcplogs deps

golang.org/x/oauth2 bf48bf16ab8d622ce64ec6ce98d2c98f916b6303

google.golang.org/api de943baf05a022a8f921b544b7827bacaba1aed5

go.opencensus.io c3ed530f775d85e577ca652cb052a52c078aad26 # v0.11.0

cloud.google.com/go 0fd7230b2a7505833d5f69b75cbd6c9582401479 # v0.23.0

github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e083ff0b9622f # v2.0.0

google.golang.org/genproto 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8

Had a PR but I think it failed #39838

So shall I skip it for now?

thaJeztah · 2020-07-30T08:27:58Z

vendor/github.com/containerd/containerd/vendor.conf

Perhaps we need to update these as well to match containerd/containerd@963625d

vendor/github.com/containerd/containerd/vendor.conf

tao12345666333 · 2020-07-30T12:23:36Z

thanks！ let me update it

v1.4.0-beta.1-150-g779ef602 Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

v1.0.0-rc91-48-g67169a9d Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

github.com/prometheus/client_golang to v1.6.0 github.com/prometheus/client_model to v0.2.0 github.com/prometheus/common to v0.9.1 github.com/prometheus/procfs to v0.0.11 Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

tao12345666333 · 2020-07-31T14:51:19Z

@thaJeztah PTAL. Thanks

thaJeztah

LGTM, thanks!

thaJeztah · 2020-08-04T09:12:05Z

vendor/github.com/containerd/containerd/cio/io_unix.go

 		}()
 	}
-	if fifos.Stderr != "" {
+	if !fifos.Terminal && fifos.Stderr != "" {


I see this fixes a potential panic; containerd/containerd#3611, but I think that was related to a change that's only in 1.3.x, so I guess no need to get that into the 19.03 branch

thaJeztah · 2020-08-04T09:34:27Z

Added "cherry-pick" label to consider backporting some of the dependency bumps related to Go 1.14 fixes

AkihiroSuda requested changes Jul 5, 2020

View reviewed changes

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 94d1b74 to 5553d95 Compare July 6, 2020 06:15

tao12345666333 requested a review from AkihiroSuda July 6, 2020 06:16

AkihiroSuda reviewed Jul 6, 2020

View reviewed changes

vendor.conf Outdated Show resolved Hide resolved

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 5553d95 to b410ba2 Compare July 6, 2020 06:35

AkihiroSuda approved these changes Jul 6, 2020

View reviewed changes

thaJeztah requested changes Jul 6, 2020

View reviewed changes

cpuguy83 previously approved these changes Jul 7, 2020

View reviewed changes

thaJeztah added area/runtime Runtime impact/changelog status/2-code-review status/failing-ci Indicates that the PR in its current state fails the test suite labels Jul 8, 2020

thaJeztah mentioned this pull request Jul 8, 2020

daemon/stats: use const for clockTicksPerSecond #41186

Merged

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from b410ba2 to af58581 Compare July 8, 2020 17:56

tao12345666333 changed the title ~~vendor runc library v1.0.0-rc91~~ [WIP] vendor runc library v1.0.0-rc91 Jul 8, 2020

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from af58581 to 00325f3 Compare July 10, 2020 06:09

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 00325f3 to cd6f452 Compare July 17, 2020 01:32

thaJeztah reviewed Jul 29, 2020

View reviewed changes

vendor.conf Outdated Show resolved Hide resolved

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from fc9b827 to 1b79bb1 Compare July 30, 2020 06:36

tao12345666333 changed the title ~~[WIP] vendor runc library v1.0.0-rc91~~ vendor runc libraryv1.0.0-rc91-48-g67169a9d Jul 30, 2020

tao12345666333 requested review from cpuguy83 and thaJeztah July 30, 2020 06:37

AkihiroSuda approved these changes Jul 30, 2020

View reviewed changes

thaJeztah reviewed Jul 30, 2020

View reviewed changes

tao12345666333 added 5 commits July 30, 2020 16:16

vendor containerd 779ef60231a555f7eb9ba82b052d59b69ca2ef10

9424ecc

v1.4.0-beta.1-150-g779ef602 Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

vendor runc 67169a9d43456ff0d5ae12b967acb8e366e2f181

9ad35b7

v1.0.0-rc91-48-g67169a9d Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

vendor bbolt v1.3.5

e58a002

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

vendor prometheus dependency.

c00d490

github.com/prometheus/client_golang to v1.6.0 github.com/prometheus/client_model to v0.2.0 github.com/prometheus/common to v0.9.1 github.com/prometheus/procfs to v0.0.11 Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

vendor protobuf v1.3.5

9f28837

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 1b79bb1 to 9f28837 Compare July 30, 2020 17:24

tao12345666333 requested a review from thaJeztah July 30, 2020 17:54

AkihiroSuda removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Aug 4, 2020

AkihiroSuda approved these changes Aug 4, 2020

View reviewed changes

thaJeztah approved these changes Aug 4, 2020

View reviewed changes

thaJeztah added status/4-merge and removed status/2-code-review labels Aug 4, 2020

thaJeztah added this to the 20.03.0 milestone Aug 4, 2020

thaJeztah added the process/cherry-pick label Aug 4, 2020

thaJeztah merged commit 79eef6e into moby:master Aug 4, 2020

tao12345666333 deleted the update-runc-to-v1.0.0-rc91 branch August 4, 2020 15:36

thaJeztah removed the process/cherry-pick label Feb 18, 2022

	# gcplogs deps
	golang.org/x/oauth2 bf48bf16ab8d622ce64ec6ce98d2c98f916b6303
	google.golang.org/api de943baf05a022a8f921b544b7827bacaba1aed5
	go.opencensus.io c3ed530f775d85e577ca652cb052a52c078aad26 # v0.11.0
	cloud.google.com/go 0fd7230b2a7505833d5f69b75cbd6c9582401479 # v0.23.0
	github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e083ff0b9622f # v2.0.0
	google.golang.org/genproto 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8

Conversation

tao12345666333 commented Jul 5, 2020 • edited by thaJeztah Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AkihiroSuda left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tao12345666333 commented Jul 6, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cpuguy83 left a comment

Choose a reason for hiding this comment

Uh oh!

cpuguy83 commented Jul 7, 2020

Uh oh!

tao12345666333 commented Jul 7, 2020

Uh oh!

thaJeztah commented Jul 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tao12345666333 commented Jul 10, 2020

Uh oh!

thaJeztah commented Jul 10, 2020

Uh oh!

tao12345666333 commented Jul 10, 2020

Uh oh!

tao12345666333 commented Jul 10, 2020

Uh oh!

thaJeztah commented Jul 16, 2020

Uh oh!

tao12345666333 commented Jul 17, 2020

Uh oh!

tao12345666333 commented Jul 18, 2020

Uh oh!

AkihiroSuda commented Jul 24, 2020

Uh oh!

thaJeztah commented Jul 29, 2020

Uh oh!

tao12345666333 commented Jul 29, 2020

Uh oh!

Uh oh!

tao12345666333 commented Jul 30, 2020

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tao12345666333 commented Jul 30, 2020

Uh oh!

tao12345666333 commented Jul 31, 2020

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tao12345666333 commented Jul 5, 2020 •

edited by thaJeztah

Loading

thaJeztah commented Jul 8, 2020 •

edited

Loading