Resolve deadlock between harvest thread and JVM shutdown thread #2539
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.
Resolves #2514
Replaces the synchronized methods and code blocks with a
ReentrantLockinstance. In theharvestNow()method, thetryLock()method is called with a 200ms timeout, so even if two threads are fighting for the lock, they will never be deadlocked since thetryLockwill timeout and continue.Wrote a few unit tests to (hopefully) reproduce the scenario and verify no deadlocks occur.