E53A vendor runc libraryv1.0.0-rc91-48-g67169a9d by tao12345666333 · Pull Request #41178 · moby/moby · GitHub
[go: up one dir, main page]

Skip to content

Conversation

tao12345666333
Copy link
Contributor
@tao12345666333 tao12345666333 commented Jul 5, 2020

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

Copy link
Member
@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update containerd together

@tao12345666333 tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 94d1b74 to 5553d95 Compare July 6, 2020 06:15
@tao12345666333 tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 5553d95 to b410ba2 Compare July 6, 2020 06:35
@tao12345666333
Copy link
Contributor Author

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
cpuguy83 previously approved these changes Jul 7, 2020
Copy link
Member
@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83
Copy link
Member
cpuguy83 commented Jul 7, 2020

Lots of failures, though. :(

@tao12345666333
Copy link
Contributor Author

@thaJeztah
Copy link
Member
thaJeztah commented Jul 8, 2020

Opened #41186 to address #41178 (comment)

@thaJeztah 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
@tao12345666333 tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from b410ba2 to af58581 Compare July 8, 2020 17:56
@tao12345666333 tao12345666333 changed the title vendor runc library v1.0.0-rc91 [WIP] vendor runc library v1.0.0-rc91 Jul 8, 2020
@tao12345666333 tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from af58581 to 00325f3 Compare July 10, 2020 06:09
@tao12345666333
Copy link
Contributor Author

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.

FF8
@thaJeztah
Copy link
Member

I think we need #41016 as well

@tao12345666333
Copy link
Contributor Author

I think we need #41016 as well

Thanks. Let me take a look.

@tao12345666333
Copy link
Contributor Author

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.

@cpuguy83 cpuguy83 dismissed their stale review July 10, 2020 18:50

Doesn't work

@thaJeztah
Copy link
Member

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

@tao12345666333
Copy link
Contributor Author

sure!

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

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
Copy link
Member

needs rebase

@thaJeztah
Copy link
Member

@tao12345666333
Copy link
Contributor Author

opened #41288

👌 Thanks

@tao12345666333 tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from fc9b827 to 1b79bb1 Compare July 30, 2020 06:36
@tao12345666333 tao12345666333 changed the title [WIP] vendor runc library v1.0.0-rc91 vendor runc libraryv1.0.0-rc91-48-g67169a9d Jul 30, 2020
@tao12345666333
Copy link
Contributor Author

CI passed 👍

Copy link
Member 5B9E
@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

Comment on lines 388 to 390
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So shall I skip it for now?

Comment on lines +37 to +38
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

@tao12345666333
Copy link
Contributor Author

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 tao12345666333 force-pushed the update-runc-to-v1.0.0-rc91 branch from 1b79bb1 to 9f28837 Compare July 30, 2020 17:24
@tao12345666333 tao12345666333 requested a review from thaJeztah July 30, 2020 17:54
@tao12345666333
Copy link
Contributor Author

@thaJeztah PTAL. Thanks

@AkihiroSuda AkihiroSuda removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Aug 4, 2020
Copy link
Member
@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

}()
}
if fifos.Stderr != "" {
if !fifos.Terminal && fifos.Stderr != "" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@thaJeztah
Copy link
Member

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

@thaJeztah thaJeztah merged commit 79eef6e into moby:master Aug 4, 2020
@tao12345666333 tao12345666333 deleted the update-runc-to-v1.0.0-rc91 branch August 4, 2020 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0