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

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Jan 30, 2023 •
edited
Loading

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

AkihiroSuda commented Jan 30, 2023 •
edited
Loading 

=== 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 fuweid mentioned this pull request Mar 8, 2023
Merged
@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

AkihiroSuda commented Mar 8, 2023

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
vendor: github.com/containerd/cgroups/v3 v3.0.1
e807ae4 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented Mar 8, 2023

Rebased

@AkihiroSuda AkihiroSuda force-pushed the containerd-cgroups-v3 branch from 896047e to e807ae4 Compare March 8, 2023 12:18
thaJeztah
thaJeztah reviewed Mar 8, 2023
View reviewed changes
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

@thaJeztah thaJeztah Mar 8, 2023

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/cgroups@v1.0.4
github.com/docker/docker github.com/containerd/cgroups/v3@v3.0.1
github.com/Microsoft/hcsshim@v0.9.7 github.com/containerd/cgroups@v1.0.1
github.com/containerd/containerd@v1.6.19 github.com/containerd/cgroups@v1.0.4
github.com/containerd/nydus-snapshotter@v0.3.1 github.com/containerd/cgroups@v1.0.3
github.com/moby/buildkit@v0.11.4 github.com/containerd/cgroups@v1.0.4
github.com/containerd/containerd@v1.5.7 github.com/containerd/cgroups@v1.0.1
github.com/Microsoft/hcsshim@v0.8.21 github.com/containerd/cgroups@v1.0.1
github.com/containerd/containerd@v1.5.0-beta.3 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/Microsoft/hcsshim@v0.8.10 github.com/containerd/cgroups@v0.0.0-20200531161412-0dbf7f05ba59
github.com/containerd/stargz-snapshotter@v0.0.0-20201027054423-3a04e4c2c116 github.com/containerd/cgroups@v0.0.0-20200710171044-318312a37340
github.com/containerd/containerd@v1.5.1 github.com/containerd/cgroups@v1.0.1
github.com/Microsoft/hcsshim@v0.8.16 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/containerd/containerd@v1.5.0-rc.0 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/Microsoft/hcsshim@v0.8.15 github.com/containerd/cgroups@v0.0.0-20200824123100-0b889c03f102
github.com/containerd/nri@v0.0.0-20201007170849-eb1350a75164 github.com/containerd/cgroups@v0.0.0-20200710171044-318312a37340
github.com/Microsoft/hcsshim@v0.8.9 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f
github.com/containerd/containerd@v1.5.0-beta.4 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/containerd/containerd@v1.5.0-beta.1 github.com/containerd/cgroups@v0.0.0-20200824123100-0b889c03f102
github.com/Microsoft/hcsshim@v0.8.14 github.com/containerd/cgroups@v0.0.0-20200531161412-0dbf7f05ba59
github.com/Microsoft/hcsshim@v0.8.7 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f
github.com/containerd/imgcrypt@v1.0.1 github.com/containerd/cgroups@v0.0.0-20190717030353-c4b9ac5c7601

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Mar 8, 2023

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/cgroups@v1.1.0
github.com/Microsoft/hcsshim@v0.10.0-rc.7 github.com/containerd/cgroups@v1.1.0
github.com/containerd/containerd@v1.7.0-rc.2 github.com/containerd/cgroups@v1.1.0
github.com/containerd/nydus-snapshotter@v0.3.1 github.com/containerd/cgroups@v1.0.3
github.com/moby/buildkit@v0.11.4 github.com/containerd/cgroups@v1.0.4
github.com/Microsoft/hcsshim@v0.8.10 github.com/containerd/cgroups@v0.0.0-20200531161412-0dbf7f05ba59
github.com/containerd/stargz-snapshotter@v0.0.0-20201027054423-3a04e4c2c116 github.com/containerd/cgroups@v0.0.0-20200710171044-318312a37340
github.com/Microsoft/hcsshim@v0.8.9 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f
github.com/Microsoft/hcsshim@v0.8.7 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f

thaJeztah
thaJeztah approved these changes Mar 8, 2023
View reviewed changes
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

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@vvoland vvoland vvoland approved these changes

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

24.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@AkihiroSuda @fuweid @vvoland @thaJeztah