Skip to content

[api] Fix race condition causing queued tasks to execute after SequentialBatchIterator close #9452

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

Merged
JingsongLi merged 1 commit into from
Aug 29, 2026
+19 −5
Merged

[api] Fix race condition causing queued tasks to execute after SequentialBatchIterator close #9452

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
24 changes: 19 additions & 5 deletions paimon-api/src/main/java/org/apache/paimon/utils/ThreadPoolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private static class SequentialBatchIterator<T, U> implements CloseableBatchIter

private Iterator<T> activeResults = Collections.<T>emptyList().iterator();
private T next;
private boolean closed;
private volatile boolean closed;

private SequentialBatchIterator(
ExecutorService executor,
Expand All @@ -243,7 +243,7 @@ private SequentialBatchIterator(

@Override
public boolean hasNext() {
if (!closed) {
if (!isClosed()) {
advanceIfNeeded();
}
return next != null;
Expand All @@ -259,6 +259,10 @@ public T next() {
return result;
}

private boolean isClosed() {
return closed;
}

private void advanceIfNeeded() {
while (next == null) {
if (activeResults.hasNext()) {
Expand Down Expand Up @@ -286,7 +290,7 @@ private void advanceIfNeeded() {
private void submitBatch(List<U> batch) {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
for (U input : batch) {
BatchTask<T, U> task = new BatchTask<>(processor, input, classLoader);
BatchTask<T, U> task = new BatchTask<>(this, processor, input, classLoader);
executor.execute(task);
activeTasks.add(task);
}
Expand Down Expand Up @@ -343,6 +347,7 @@ private static class BatchTask<T, U> implements Runnable {
private static final int CANCELLED = 2;
private static final int FINISHED = 3;

private final SequentialBatchIterator<T, U> iterator;
private final Function<U, List<T>> processor;
private final U input;
private final ClassLoader classLoader;
Expand All @@ -354,7 +359,12 @@ private static class BatchTask<T, U> implements Runnable {
private Throwable failure;
private volatile boolean failureReported;

private BatchTask(Function<U, List<T>> processor, U input, ClassLoader classLoader) {
private BatchTask(
SequentialBatchIterator<T, U> iterator,
Function<U, List<T>> processor,
U input,
ClassLoader classLoader) {
this.iterator = iterator;
this.processor = processor;
this.input = input;
this.classLoader = classLoader;
Expand All @@ -363,7 +373,7 @@ private BatchTask(Function<U, List<T>> processor, U input, ClassLoader classLoad
@Override
public void run() {
synchronized (this) {
if (state == CANCELLED) {
if (isCanceled()) {
state = FINISHED;
completion.countDown();
return;
Expand All @@ -386,6 +396,10 @@ public void run() {
}
}

private boolean isCanceled() {
return state == CANCELLED || iterator.isClosed();
}

private synchronized void cancel() {
if (state == CREATED) {
state = CANCELLED;
Expand Down
Loading