Skip to content

vendor: github.com/containerd/cgroups/v3 v3.0.1#44886

Merged
thaJeztah merged 1 commit intomoby:masterfrom
AkihiroSuda:containerd-cgroups-v3
Mar 8, 2023
Merged

vendor: github.com/containerd/cgroups/v3 v3.0.1#44886
thaJeztah merged 1 commit intomoby:masterfrom
AkihiroSuda:containerd-cgroups-v3

Conversation

@thaJeztah thaJeztah added this to the v-next milestone Jan 30, 2023
@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented Jan 30, 2023

=== RUN   TestStats
    stats_test.go:41: assertion failed: 0 (int64) != 7281278976 (info.MemTotal int64)
    stats_test.go:42: assertion failed: reflect.DeepEqual(v.PreCPUStats, types.CPUStats{}) is true
    stats_test.go:53: assertion failed: 0 (int64) != 7281278976 (info.MemTotal int64)
--- FAIL: TestStats (2.33s)

Probably due to

@AkihiroSuda AkihiroSuda marked this pull request as draft January 30, 2023 15:39
@AkihiroSuda AkihiroSuda changed the title vendor: github.com/containerd/cgroups/v3 v3.0.0 vendor: github.com/containerd/cgroups/v3 v3.0.1 Jan 30, 2023
@AkihiroSuda AkihiroSuda force-pushed the containerd-cgroups-v3 branch from cc06453 to 1aa7a8c Compare January 30, 2023 16:05
@fuweid
Copy link
Copy Markdown
Contributor

fuweid commented Mar 8, 2023

@AkihiroSuda please update the typeurl as well. please check the comment containerd/containerd#8233 (comment)

@AkihiroSuda AkihiroSuda force-pushed the containerd-cgroups-v3 branch from 1aa7a8c to 896047e Compare March 8, 2023 10:41
@AkihiroSuda
Copy link
Copy Markdown
Member Author

Updated, thanks @fuweid

@AkihiroSuda AkihiroSuda marked this pull request as ready for review March 8, 2023 10:42
@vvoland
Copy link
Copy Markdown
Contributor

vvoland commented Mar 8, 2023

We have a separate PR for upgrading typeurl: #45094
I just rebased it. So probably we could merge it since it already has some LGTM's, and then rebase this one?

@AkihiroSuda
Copy link
Copy Markdown
Member Author

Rebased

@AkihiroSuda AkihiroSuda force-pushed the containerd-cgroups-v3 branch from 896047e to e807ae4 Compare March 8, 2023 12:18
Comment thread vendor.mod
github.com/cilium/ebpf v0.7.0 // indirect
github.com/cilium/ebpf v0.9.1 // indirect
github.com/container-storage-interface/spec v1.5.0 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I guess most of these will go away if we update containerd vendor to 1.7 (I need to update my PR #44530).

Was giving the hcsshim one a try (microsoft/hcsshim#1618), but didn't get too far.

go mod graph --modfile=vendor.mod | grep ' github.com/containerd/cgroups'

github.com/docker/docker github.com/containerd/[email protected]
github.com/docker/docker github.com/containerd/cgroups/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/moby/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

With containerd 1.7.0-rc.2, it looks like;

go mod graph --modfile=vendor.mod | grep ' github.com/containerd/cgroups@'
github.com/docker/docker github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/moby/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/containerd/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]
github.com/Microsoft/[email protected] github.com/containerd/[email protected]

Copy link
Copy Markdown
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!

@thaJeztah thaJeztah merged commit 239e0a2 into moby:master Mar 8, 2023
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.

4 participants