[release/1.3 backport] eventfd leak#3961
Merged
estesp merged 3 commits intocontainerd:release/1.3from Jan 15, 2020
Merged
Conversation
Only start watching the cgroup for OOMs when the first process starts instead of on every process. Signed-off-by: Seth Pellegrino <spellegrino@newrelic.com>
There's no OOM monitoring for the v2 cgroups yet, so it seems unlikely that there was a leak in that case. Signed-off-by: Seth Pellegrino <spellegrino@newrelic.com>
Merged
Contributor
Author
|
@AkihiroSuda Will there be a minor version released with this fix once we merge the PR? |
|
Build succeeded.
|
AkihiroSuda
approved these changes
Jan 15, 2020
Member
AkihiroSuda
left a comment
There was a problem hiding this comment.
Thanks
cc @dmcgowan for release
Member
|
CI failing 🤔 |
zhsj
suggested changes
Jan 15, 2020
runtime/v2/runc/v1/service.go
Outdated
| } | ||
| switch r.ExecID { | ||
| case "": | ||
| if err := s.ep.Add(container.ID, cg); err != nil { |
Contributor
There was a problem hiding this comment.
CI failed, it's undeclared name: cg
s.ep.Add(container.ID, container.Cgroup());
|
Build succeeded.
|
Signed-off-by: Seth Pellegrino <spellegrino@newrelic.com>
f185234 to
03ee836
Compare
|
Build succeeded.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See: