Skip to content

8385830: ForkJoinTask#get may swallow caller thread's interrupt flag #31376

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

Open
viktorklang-ora wants to merge 1 commit into
base: master
Choose a base branch
from
Open

8385830: ForkJoinTask#get may swallow caller thread's interrupt flag #31376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,19 +418,15 @@ else if (((a = aux) == null || a.ex == null) &&
for (;;) {
if ((s = status) < 0)
break;
else if (interrupts < 0) {
s = ABNORMAL; // interrupted and not done
break;
}
else if (Thread.interrupted()) {
if (!ForkJoinPool.poolIsStopping(pool))
interrupts = interruptible ? -1 : 1;
else {
interrupts = 1; // re-assert if cleared
if (ForkJoinPool.poolIsStopping(pool)) {
try {
cancel(true);
} catch (Throwable ignore) {
}
} catch (Throwable ignore) { }
}
if ((interrupts = interruptible ? -1 : 1) < 0) {
s = ABNORMAL;
break;
}
}
else if (deadline != 0L) {
Expand Down
17 changes: 17 additions & 0 deletions test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,23 @@ public void realRun() throws Exception {
}
}

public void testCallerInterruptedDuringSubmit() throws InterruptedException, ExecutionException {
final Thread submitter = Thread.currentThread();
final ExecutorService p = new ForkJoinPool(1);
try (PoolCleaner cleaner = cleaner(p)) {
Copy link
Copy Markdown
Contributor

@AlanBateman AlanBateman Jun 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As ExecutorService extends AutoCloseable then I assume PoolCleaner is not needed here.

Copy link
Copy Markdown
Contributor Author

@viktorklang-ora viktorklang-ora Jun 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. I'm following the convention in the test file: https://github.com/openjdk/jdk/pull/31376/changes/BASE..0231ed9e9cb2041a3bf5c7ef5e32c22ddecf93db#diff-cf95a2f5a26f4a620d0c7ed6525dba84aeaea5e88b1c382900869d0f265ed367R689

for (int i = 0; i < 512; ++i) { // Enough repetitions such that any race condition is bound to materialize
try {
p.submit(submitter::interrupt).get();
// If we don't get an InterruptedException, then the current thread should be interrupted
assertTrue(Thread.interrupted());
} catch (InterruptedException e) {
// If we do get an InterruptedException, then the current thread should not be interrupted
assertTrue(!Thread.interrupted());
}
}
}
}

/**
* get of submit(callable) throws ExecutionException if callable
* throws exception
Expand Down