Fix deadlock in ForkJoinPoolHierarchicalTestExecutorService
#3981
Conversation
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
Co-authored-by: Marc Philipp <mail@marcphilipp.de>
leonard84
force-pushed
the
leo/fix-for-join-pool-thread-deadlock
branch
from
6da042f to
b2922c5
Compare
The service now checks if the `ExclusiveTask` that should run is executed on a thread that is already executing another task. If this is scenario is detected, it checks if the lock is compatible to the enclosing locks. 1. If compatible, it is executed and marked done 2. If incompatible, it is added to a list of deferred tasks and left unfinished. The deferred tasks will be re-forked afterward. fixes junit-team#3945 Co-authored-by: Marc Philipp <mail@marcphilipp.de>
leonard84
force-pushed
the
leo/fix-for-join-pool-thread-deadlock
branch
from
b2922c5 to
d6428b8
Compare
sbrannen
changed the title
ForkJoinPoolHierarchicalTestExecutorService
leonard84
commented
Sep 13, 2024
...latform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
Outdated
Show resolved
Hide resolved
...latform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
Show resolved
Hide resolved
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
Outdated
Show resolved
Hide resolved
marcphilipp
approved these changes
Sep 16, 2024
leonard84
commented
Sep 16, 2024
.../junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
Outdated
Show resolved
Hide resolved
.../junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
Show resolved
Hide resolved
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Leonard Brünings <leonard.bruenings@gradle.com>
marcphilipp
added a commit
that referenced
this pull request
Sep 17, 2024
The service now checks if the `ExclusiveTask` that should run is executed on a thread that is already executing another task. If this is scenario is detected, it checks if the lock is compatible to the enclosing locks. 1. If compatible, it is executed and marked done 2. If incompatible, it is added to a list of deferred tasks and left unfinished. The deferred tasks will be re-forked afterwards. Fixes #3945. --------- Co-authored-by: Marc Philipp <mail@marcphilipp.de>
marcphilipp
added a commit
that referenced
this pull request
Sep 23, 2024
The service now checks if the `ExclusiveTask` that should run is executed on a thread that is already executing another task. If this is scenario is detected, it checks if the lock is compatible to the enclosing locks. 1. If compatible, it is executed and marked done 2. If incompatible, it is added to a list of deferred tasks and left unfinished. The deferred tasks will be re-forked afterwards. Fixes #3945. --------- Co-authored-by: Marc Philipp <mail@marcphilipp.de> (cherry picked from commit 88f8859)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Overview
fixes #3945
This PR actually fixes the problem that was attempted in #3936.
That PR is still valid on its own, although it didn't fix the actual problem.
The release notes still apply for this as well.
I hereby agree to the terms of the JUnit Contributor License Agreement.
Definition of Done
@APIannotations