ESQL: Fix async operator warnings not always sent when blocking #132744
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| pr: 132744 | ||
| summary: Fix async operator warnings not always sent when blocking | ||
| area: ES|QL | ||
| type: bug | ||
| issues: | ||
| - 130642 | ||
| - 132554 | ||
| - 132778 | ||
| - 130296 | ||
| - 132555 | ||
| - 131563 | ||
| - 131148 | ||
| - 132604 | ||
| - 128030 |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,19 +95,16 @@ public void addInput(Page input) { | |
| driverContext.addAsyncAction(); | ||
| boolean success = false; | ||
| try { | ||
| final ActionListener<Fetched> listener = ActionListener.wrap(output -> buffers.put(seqNo, output), e -> { | ||
| releasePageOnAnyThread(input); | ||
| failureCollector.unwrapAndCollect(e); | ||
| }); | ||
| final long startNanos = System.nanoTime(); | ||
| performAsync(input, ActionListener.runAfter(listener, () -> { | ||
| responseHeadersCollector.collect(); | ||
| processNanos.add(System.nanoTime() - startNanos); | ||
| onSeqNoCompleted(seqNo); | ||
| driverContext.removeAsyncAction(); | ||
| })); | ||
| success = true; | ||
| } finally { | ||
|
|
@@ -241,7 +238,7 @@ public IsBlockedResult isBlocked() { | |
|
|
||
| @Override | ||
| public final Operator.Status status() { | ||
| return status(checkpoint.getMaxSeqNo() + 1, checkpoint.getProcessedCheckpoint() + 1, processNanos.sum()); | ||
|
||
| } | ||
|
|
||
| protected Operator.Status status(long receivedPages, long completedPages, long processNanos) { | ||
|
|
||
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Answering you here @dnhatn, as to have a thread)
From what I see, there's already an
if (fetched != null)there on line 170, so no possible NPE, unless you mean something else or I missed something 👀elasticsearch/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AsyncOperator.java
Lines 165 to 174 in 9f927b2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Ivan. I took another closer look. I think we are all good.