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

Update cgroupv2 vendor #4350

Merged
merged 7 commits into from
Nov 26, 2024
Merged

Update cgroupv2 vendor #4350

merged 7 commits into from
Nov 26, 2024

Conversation

jchorl
Copy link
Contributor

@jchorl jchorl commented Sep 18, 2024

Summary

Patch version bump of cgroup from 3.0.2 to 3.0.4. Mostly just trying to pick up this fix: containerd/cgroups@9008873

Notably, it bumps the timeout for creating cgroup resources from 1s to 30s(!). It also adds some robustness around creating cgroup resources.

I found in my logs:

open /sys/fs/cgroup/ecstasks.slice/ecstasks-fb14b37bb0e24c358a4a9d2717274e11.slice/cgroup.controllers: no such file or directory

So I'm optimistic this may help!

There are also many other good fixes in the latest release of cgroups.

Implementation details

Just a vendor bump.

I first got in a container:

docker run -it --rm \
    -v $(pwd):/go/src/github.com/aws/amazon-ecs-agent \
    -w /go/src/github.com/aws/amazon-ecs-agent \
    golang:1.22.7 \
    bash

Then:

root@8ace06e88590:/go/src/github.com/aws/amazon-ecs-agent# cd agent
root@8ace06e88590:/go/src/github.com/aws/amazon-ecs-agent# go get -u github.com/containerd/cgroups/[email protected]
root@8ace06e88590:/go/src/github.com/aws/amazon-ecs-agent# go get ./...
root@8ace06e88590:/go/src/github.com/aws/amazon-ecs-agent# go mod vendor

Testing

Ran make test locally

New tests cover the changes: N/A

Description for the changelog

Update agent version of https://github.com/containerd/cgroups from v3.0.2 to v3.0.4

Additional Information

N/A

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@jchorl jchorl requested a review from a team as a code owner September 18, 2024 18:07
@jchorl jchorl changed the base branch from master to dev September 18, 2024 18:07
@jchorl jchorl force-pushed the jchorl/updatecgroup branch from 0aabad1 to 1d5caa8 Compare October 1, 2024 20:55
@jchorl
Copy link
Contributor Author

jchorl commented Nov 22, 2024

@tinnywang @prateekchaudhry what's the path to getting this merged?

@danehlim danehlim merged commit de95b39 into aws:dev Nov 26, 2024
40 checks passed
@danehlim
Copy link
Contributor

@jchorl:

@tinnywang @prateekchaudhry what's the path to getting this merged?

Hi @jchorl, thank you for your contribution! This pull request has been reviewed, approved, and now merged to dev branch. It will be merged to master branch as part of the next new ECS Agent release (which is currently estimated to happen early December).

@jchorl
Copy link
Contributor Author

jchorl commented Nov 26, 2024

Thank you for helping push it through!

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.

4 participants