Skip to content

[release/1.3 backport] Update cgroups#4105

Closed
dims wants to merge 4 commits intocontainerd:release/1.3from
dims:update-cgroups
Closed

[release/1.3 backport] Update cgroups#4105
dims wants to merge 4 commits intocontainerd:release/1.3from
dims:update-cgroups

Conversation

@dims
Copy link
Copy Markdown
Member

@dims dims commented Mar 12, 2020

Same as e1221e6 originally filed by @AkihiroSuda

dims added 2 commits March 12, 2020 13:17
Same as e1221e6

Note: now vndr >= v0.10 is required (containerd/cgroups#139)

Signed-off-by: Davanum Srinivas <[email protected]>
Signed-off-by: Davanum Srinivas <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member

relates to / fixes #3951

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 12, 2020

Build succeeded.

@AkihiroSuda
Copy link
Copy Markdown
Member

@thaJeztah 1.3 doesn't support v2

Comment thread metrics/types/v1/types.go Outdated
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 12, 2020

Build succeeded.

changes from 8ff5827

Signed-off-by: Davanum Srinivas <[email protected]>
@AkihiroSuda
Copy link
Copy Markdown
Member

Commit message
Same as e1221e6

Please consider using git cherry-pick -x -a -s next time for generating cherry-pick commit messages

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 12, 2020

Build succeeded.

@dims
Copy link
Copy Markdown
Member Author

dims commented Mar 12, 2020

ugh, bad circular dependency!

vendor/github.com/containerd/cri/pkg/server/container_stats_list.go:103:18: undefined: cgroups.Metrics
vendor/github.com/containerd/cri/pkg/server/container_stats_list.go:176:28: undefined: cgroups.MemoryStat

@thaJeztah @AkihiroSuda what do we do?

@AkihiroSuda
Copy link
Copy Markdown
Member

You can temporarily vendor your own fork of cri

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah 1.3 doesn't support v2

whoops, my bad; copied the "fixes" from the original PR without clicking through to see the issue description

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 12, 2020

Build succeeded.

@dims
Copy link
Copy Markdown
Member Author

dims commented Mar 12, 2020

@estesp if you are around PTAL! this is step 1 to backport #4088 will be following this up with a PR against containerd/cri and then update #4104

@dims dims closed this Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants