Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add cgroup v2 support for metrics #163

Merged
merged 3 commits into from
Aug 3, 2023
Merged

Conversation

Mossaka
Copy link
Member

@Mossaka Mossaka commented Aug 2, 2023

This commits adds cgroup v2 support for collecting metrics in the shim.

Additionally, it uses CPU controller instead of the CPUAcct controller
for reporting CPU metrics back to containerd.

Closes #162

This commits adds cgroup v2 support for collecting metrics in the shim.

Additionally, it uses CPU controller instead of the CPUAcct controller
for reporting CPU metrics back to containerd.

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
@mxpv
Copy link
Member

mxpv commented Aug 2, 2023

This PR includes changes from #161
Could you pls rebase this PR against main branch?

@Mossaka
Copy link
Member Author

Mossaka commented Aug 2, 2023

Could you pls rebase this PR against main branch?

Absolutely. Done :)

@jsturtevant
Copy link
Contributor

LGTM

Would it be worth adding ubuntu 22.04 to

os: [ubuntu-20.04]
I believe 22.04 has cgroupv2 by default so that would add some coverage? Maybe in a follow up incase there are other issues?

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
@Mossaka
Copy link
Member Author

Mossaka commented Aug 3, 2023

Could we merge this? @mxpv

@mxpv mxpv merged commit 816771b into containerd:main Aug 3, 2023
13 checks passed
@mxpv
Copy link
Member

mxpv commented Aug 3, 2023

Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-shim Containerd shim
Projects
None yet
Development

Successfully merging this pull request may close these issues.

stats doesn't work on cgroup v2
3 participants