[bugfix] Improve handling of global and local mutexes to mitigate capture deadlocks #335
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
fako1024
added
bug
3 tasks
fako1024
commented
Jul 11, 2024
| @@ -44,57 +44,6 @@ var ( | |||
| // providing the ability to override the default behavior, e.g. in mock tests | |||
| type sourceInitFn func(*Capture) (Source, error) | |||
|
|
|||
| // Captures denotes a named set of Capture instances, wrapping a map and the | |||
There was a problem hiding this comment.
This is just cleanup, moved to new file captures.go below...
| @@ -515,6 +519,10 @@ func (cm *Manager) rotate(ctx context.Context, writeoutChan chan<- capturetypes. | |||
| // Lock the running capture in order to safely perform rotation tasks | |||
| if err := mc.capLock.Lock(); err != nil { | |||
| logger.Errorf("failed to establish rotation three-point lock: %s", err) | |||
| if err := mc.close(); err != nil { | |||
There was a problem hiding this comment.
This was missing (I think because I was worried that we might end up with duplicate calls to close(). However, this is now reasonably safe due to the additional capture Mutex.
| @@ -560,17 +572,17 @@ func (cm *Manager) logErrors(ctx context.Context, iface string, errsChan <-chan | |||
|
|
|||
| // Ensure there is no conflict with calls to update() that might already be | |||
| // taking down this interface | |||
| cm.Lock() | |||
| defer cm.Unlock() | |||
| cm.captures.Lock() | |||
There was a problem hiding this comment.
This is a tiny detail, but important. We lock the set of captures (because that's the only thin we potentially manipulate here) instead of the whole manager.
fako1024
changed the title
fako1024
changed the title
els0r
approved these changes
Jul 13, 2024
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.
Closes #334