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

Handle cgroup v1 or v2 to enable resource updates #177

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

jsturtevant
Copy link
Contributor

Part of #122

This test was failing in 22.04 because it has cgroups v2. This follows same pattern as the metrics to select either v1 or v2.

@github-actions github-actions bot added C-shim Containerd shim T-CI Changes in project's CI labels Aug 10, 2023
@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from 4bdfe9a to 6abb8b4 Compare August 11, 2023 00:06
crates/shim/src/cgroup.rs Outdated Show resolved Hide resolved
@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from 6abb8b4 to 7fe4fa3 Compare August 11, 2023 15:56
@jsturtevant
Copy link
Contributor Author

that failure wasn't related to the shim tests, it was a go get issue.

go: github.com/AdaLogics/[email protected] (replaced by github.com/AdamKorcz/[email protected][12](https://github.com/containerd/rust-extensions/actions/runs/5834574304/job/15824406429#step:7:13)32327-1f10f66a31bf): version "v0.0.0-20230111232327-1f10f66a31bf" invalid: unknown revision 1f10f66a31bf
make: *** [Makefile:215: integration] Error 1

@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from 7fe4fa3 to c272eae Compare August 11, 2023 16:31
@jsturtevant
Copy link
Contributor Author

same go get error again (but other integration tests passed just fine :-/)

@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from c272eae to 7bdc6a2 Compare August 11, 2023 17:32
@jsturtevant
Copy link
Contributor Author

go get is stuggling today, I will try again Monday morning.

@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from 7bdc6a2 to 103c093 Compare August 15, 2023 22:25
@jsturtevant
Copy link
Contributor Author

Same go get issue today. I will need to look deeper :-/

@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from 103c093 to c89eb30 Compare August 18, 2023 16:01
@jsturtevant jsturtevant force-pushed the fix-update-cgroup-taskupdate branch from c89eb30 to 3e7647d Compare August 21, 2023 16:19
@mxpv mxpv merged commit 8590ef8 into containerd:main Aug 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-shim Containerd shim T-CI Changes in project's CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants