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
[release/1.2] bump cgroups dependency to address blkio issue #4001
[release/1.2] bump cgroups dependency to address blkio issue #4001
Conversation
Not sure why the CI failed, it does not seem related to the change (but I may be missing something) |
You just need to sign your commit and force push |
assuming your "upstream" remote (this repository) is named git reset --hard upstream/release/1.2
git cherry-pick -s -x 341c7c144f64d2a621160ba2dc667d67668879ea a1f3ebaec888b5bb816fa5b3437eb3ff7d81b415
git push -f origin |
@thaJeztah - @lbernail just needs to sign this commit for this PR |
Signed-off-by: Laurent Bernaille <laurent.bernaille@datadoghq.com>
99f29ed
to
25a806c
Compare
Codecov Report
@@ Coverage Diff @@
## release/1.2 #4001 +/- ##
============================================
Coverage 44.19% 44.19%
============================================
Files 100 100
Lines 10847 10847
============================================
Hits 4794 4794
Misses 5313 5313
Partials 740 740
Continue to review full report at Codecov.
|
I'm not sure it matters a ton. @dmcgowan - Do you have a preference that this be a cherry pick from mainline? |
Whoops, didn't catch up;
Yes, the end result would the same; it's "metadata" that would differ; I usually try to cherry-pick to keep references to the original commit (the Not a blocker probably |
I completely understand how reusing the master commits helps with readability |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
verified that this update is already in the release/1.3 branch (a1f3eba), so no need to backport for 1.3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
The thirteenth patch release for `containerd` 1.2 fixes a regression introduced in v1.2.12 that caused container/shim to hang on single core machines, fixes an issue with blkio, and updates the Golang runtime to 1.12.17. Notable Updates ---------------------------------- * Fix container pid race condition [containerd#4025](containerd#4025) * Update containerd/cgroups dependency to address blkio issue [containerd#4001](containerd#4001) * Set octet-stream content-type on PUT request [containerd#4028](containerd#4028) * Pin to libseccomp 2.3.3 to preserve compatibility with hosts that do not have libseccomp 2.4 or higher installed [containerd#4015](containerd#4015) * Update Golang runtime to 1.12.17, which includes a fix to the runtime [containerd#4031](containerd#4031) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Issue #3412 also impacts 1.2, which we are using extensively
This PR bumps the cgroups dependency to the same commit used in 1.3 (it includes more changes but it is much easier this way).
I did some testing on our clusters and I confirm that with this change the issue preventing the metrics from working disappear.
I may be missing other impacts, so of course let me know if this is the best approach.