ESQL: Fix Driver status iterations and cpuTime #123290
Merged
Conversation
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
|
Hi @ivancea, I've created a changelog YAML for you. |
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
|
Hi @ivancea, I've updated the changelog YAML for you. |
bpintea
approved these changes
Feb 24, 2025
| currentIteration++; | ||
| unreportedIterations++; | ||
|
|
||
| long now = nowSupplier.getAsLong(); |
There was a problem hiding this comment.
Optional: you could extract an elapsed time, since all the checks use that as 1st updateStatus() param.
There was a problem hiding this comment.
One branch doesn't use that calculation, and it may be unused if no if is executed. So I would keep it that way, probably
Comment on lines
206
to
208
| int currentIteration = 0; | ||
| // The iterations to be reported on the next status update. | ||
| int unreportedIterations = 0; |
There was a problem hiding this comment.
Optional: you could call them totalIterations (and currentIterations, respectively).
There was a problem hiding this comment.
Just made the variable names more explicit 👀
idegtiarenko
approved these changes
Feb 25, 2025
# Conflicts: # x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/DriverTests.java
nik9000
approved these changes
Feb 27, 2025
💔 Backport failed
You can use sqren/backport to manually backport by running |
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Feb 28, 2025
Fixes elastic#122967 When the Driver reported status, if the "report at least every X time" report was triggered, it was re-adding the same iterations and cpuTime again, as it wasn't clearing it before the next iteration. Now, there are separated variables for the last updated iterations and reported time.
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Feb 28, 2025
Fixes elastic#122967 When the Driver reported status, if the "report at least every X time" report was triggered, it was re-adding the same iterations and cpuTime again, as it wasn't clearing it before the next iteration. Now, there are separated variables for the last updated iterations and reported time.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Feb 28, 2025
Fixes #122967 When the Driver reported status, if the "report at least every X time" report was triggered, it was re-adding the same iterations and cpuTime again, as it wasn't clearing it before the next iteration. Now, there are separated variables for the last updated iterations and reported time.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Feb 28, 2025
Fixes #122967 When the Driver reported status, if the "report at least every X time" report was triggered, it was re-adding the same iterations and cpuTime again, as it wasn't clearing it before the next iteration. Now, there are separated variables for the last updated iterations and reported time.
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Apr 15, 2025
Without elastic#123290 we're not going to get accurate status reports. They are indicative, but not accurate. Closes elastic#126808
nik9000
added a commit
that referenced
this pull request
Apr 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #122967
When the Driver reported status, if the "report at least every X time" report was triggered, it was re-adding the same iterations and cpuTime again, as it wasn't clearing it before the next iteration.
Now, there are separated variables for the last updated iterations and reported time.