metrics/cgroups: fix deadlock issue in Add during Collect#6788
Merged
mikebrow merged 1 commit intocontainerd:mainfrom Apr 11, 2022
Merged
metrics/cgroups: fix deadlock issue in Add during Collect#6788mikebrow merged 1 commit intocontainerd:mainfrom
mikebrow merged 1 commit intocontainerd:mainfrom
Conversation
87c0dd6 to
72258cd
Compare
|
Build succeeded.
|
Member
|
This doesn't affect v1.5? Or same issue there? |
Member
Author
It was introduced by #5744 and released from 1.6 😃 |
Member
|
Thanks! (just checking if I didn't have to 🍒⛏ for 1.5 as well |
mikebrow
reviewed
Apr 9, 2022
The Collector.Collect will be the field ns'Collect's callback, which be invoked periodically with internal lock. And Collector.Add also runs with ns.Lock in Collector.Lock, which is easy to cause deadlock. Goroutine X: ns.Collect ns.Lock Collector.Collect Collector.RLock Goroutine Y: Collector.Add Collector.Lock ns.Lock We should use ns.Lock without Collector.Lock in Add. Fix: containerd#6772 Signed-off-by: Wei Fu <fuweid89@gmail.com>
|
Build succeeded.
|
dmcgowan
approved these changes
Apr 10, 2022
Contributor
|
Thanks heaps for the quick response to this |
Contributor
|
When do you plan to release 1.6.3 with the fix? |
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
6 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.
The Collector.Collect will be the field ns'Collect's callback, which be
invoked periodically with internal lock. And Collector.Add also runs
with ns.Lock in Collector.Lock, which is easy to cause deadlock.
Goroutine X:
Goroutine Y:
We should use ns.Lock without Collector.Lock in Add.
Fix: #6772
Signed-off-by: Wei Fu fuweid89@gmail.com