pkg/containers: fix deadlock #3311
Merged
Conversation
This file contains 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
josedonizetti
force-pushed
the
fix-deadlock
branch
from
8ed7334
to
cce32d1
Compare
|
IMO this should be backported, thanks for finding this (and sorry for introducing it 😅). |
|
@NDStrahilevitz can you review? Also, do you think backport, or can we release 0.16.1? |
NDStrahilevitz
approved these changes
Jul 12, 2023
|
About the backporting, are you asking if we should branch out again to a new release branch, or backport to the existing v0.16.0 branch? If so, I believe we agreed on always doing the latter from now on. |
josedonizetti
force-pushed
the
fix-deadlock
branch
2 times, most recently
from
d095ee2
to
7a73083
Compare
josedonizetti
force-pushed
the
fix-deadlock
branch
2 times, most recently
from
2489c6e
to
bf7e685
Compare
josedonizetti
force-pushed
the
fix-deadlock
branch
from
bf7e685
to
7905e39
Compare
|
@NDStrahilevitz changed, can you take another look? pls |
|
Cherry-picked at #3315 to v0.16.0 branch (will be at v0.16.1 release as well). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 write Lock() is not getting released because of the defer, blocking the read RLock(), and the pipeline.
1. Explain what the PR does
Fix #3310
We had a deadlock introduced on the last release on the PR #3285
The write
Lock()isn't getting release due to thedefer, which blocks the readRLockand the pipeline.To fix it, I remove the defer and did the lock() and unlock() on the critical path, also removed the
return, we only update the cgroupMap inside the if logic, then move on to get the cgroupInfo and return. There are other ways of fixing it, let me know if you think it should be different.2. Explain how to test it
The simplest to simulate the bug is to run tracee into kind or minukube.
3. Other comments