Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deadlock in ForkJoinPoolHierarchicalTestExecutorService #3981

Merged
merged 23 commits into from
Sep 17, 2024
Merged

Fix deadlock in ForkJoinPoolHierarchicalTestExecutorService #3981

merged 23 commits into from
Sep 17, 2024

Commits on Sep 11, 2024

  1. Deadlock Reproducer 

    Co-authored-by: Marc Philipp <[email protected]>
    @leonard84 @marcphilipp
    leonard84 and marcphilipp committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e951f59 View commit details
    Browse the repository at this point in the history

  2. Fix deadlock in ForkJoinPoolHierarchicalTestExecutorService 

    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 <[email protected]>
    @leonard84 @marcphilipp
    leonard84 and marcphilipp committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    d6428b8 View commit details
    Browse the repository at this point in the history

  3. WIP

    @leonard84
    leonard84 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    693286c View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Make Spotless happy

    @marcphilipp
    marcphilipp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    ff009b5 View commit details
    Browse the repository at this point in the history

  2. Fix ResourceLockTests

    @marcphilipp
    marcphilipp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    837a93f View commit details
    Browse the repository at this point in the history

  3. Comment out debug output

    @marcphilipp
    marcphilipp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    5a59812 View commit details
    Browse the repository at this point in the history

  4. Check that non-asynchronously tasks were executed

    @marcphilipp
    marcphilipp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    d6f7896 View commit details
    Browse the repository at this point in the history

  5. Polish initialization

    @marcphilipp
    marcphilipp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    e244bd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Polish tests

    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    9bf01d7 View commit details
    Browse the repository at this point in the history

  2. Stabilize test case

    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    5683ef4 View commit details
    Browse the repository at this point in the history

  3. fixup! Stabilize test case

    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    4d1b121 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into leo/fix-for-join-pool… 

    …-thread-deadlock
    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    d00a538 View commit details
    Browse the repository at this point in the history

  5. Add unit tests for deferring tasks with conflicting locks

    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    20fc333 View commit details
    Browse the repository at this point in the history

  6. Simplify control flow

    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    68b3845 View commit details
    Browse the repository at this point in the history

  7. Restore blank line

    @marcphilipp
    marcphilipp committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    2c2b9ee View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Stabilize test

    @marcphilipp
    marcphilipp committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    a512f38 View commit details
    Browse the repository at this point in the history

  2. Use special classes for global locks in all cases

    @marcphilipp
    marcphilipp committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    c87721f View commit details
    Browse the repository at this point in the history

  3. Put common case first

    @marcphilipp
    marcphilipp committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    cd364fc View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Avoid race condition in test

    @marcphilipp
    marcphilipp committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    8b40e47 View commit details
    Browse the repository at this point in the history

  2. Make Spotless happy

    @marcphilipp
    marcphilipp committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    71ecec3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into leo/fix-for-join-pool-thread-deadlock

    @marcphilipp
    marcphilipp authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    063af2d View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Use established pattern for toString() methods 

    Co-authored-by: Leonard Brünings <[email protected]>
    @marcphilipp @leonard84
    marcphilipp and leonard84 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    7509773 View commit details
    Browse the repository at this point in the history

  2. Simplify handling of ThreadLocal

    @marcphilipp
    marcphilipp committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5256049 View commit details
    Browse the repository at this point in the history