Skip to content

[8.19] Fix BulkInferenceExecutorTests timeout caused by a race condition. (#130991) #132282

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
merged 3 commits into from
Aug 1, 2025
Merged

[8.19] Fix BulkInferenceExecutorTests timeout caused by a race condition. (#130991) #132282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
908216b
Fix BulkInferenceExecutorTests timeout caused by a race condition. (#…
afoucret Jul 31, 2025
24f3121
Merge branch '8.19' into backport/8.19/pr-130991
afoucret Aug 1, 2025
73c285f
Merge branch '8.19' into backport/8.19/pr-130991
afoucret Aug 1, 2025
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
6 changes: 3 additions & 3 deletions ...rc/main/java/org/elasticsearch/xpack/esql/inference/bulk/BulkInferenceExecutionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public class BulkInferenceExecutionState {
private final Map<Long, InferenceAction.Response> bufferedResponses;
private final AtomicBoolean finished = new AtomicBoolean(false);

public BulkInferenceExecutionState(int bufferSize) {
this.bufferedResponses = new ConcurrentHashMap<>(bufferSize);
public BulkInferenceExecutionState() {
this.bufferedResponses = new ConcurrentHashMap<>();
}

/**
Expand Down Expand Up @@ -125,7 +125,7 @@ public void addFailure(Exception e) {
* Indicates whether the entire bulk execution is marked as finished and all responses have been successfully persisted.
*/
public boolean finished() {
return finished.get() && getMaxSeqNo() == getPersistedCheckpoint();
return hasFailure() || (finished.get() && getMaxSeqNo() == getPersistedCheckpoint());
}

/**
Expand Down
Loading