Adjust DateHistogram's bucket accounting to be iteratively #101012
Merged
Conversation
This file contains 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
…during reduce instead accounting all buckets at the end of the reduce. In case of many non-empty buckets accounting the number of buckets at the end of the reduce may be too late. Elasticsearch may already have failed with an OOME. This change changes the accounting to happen iteratively during the reduce for non-empty bucket. Note that for empty buckets accounting of the number of buckets already happens iteratively.
|
Hi @martijnvg, I've created a changelog YAML for you. |
|
Pinging @elastic/es-analytics-geo (Team:Analytics) |
iverase
reviewed
Oct 18, 2023
| @@ -323,6 +324,10 @@ protected boolean lessThan(IteratorAndCurrent<Bucket> a, IteratorAndCurrent<Buck | |||
| // the key changes, reduce what we already buffered and reset the buffer for current buckets | |||
| final Bucket reduced = reduceBucket(currentBuckets, reduceContext); | |||
| if (reduced.getDocCount() >= minDocCount || reduceContext.isFinalReduce() == false) { | |||
| if (consumeBucketCount++ >= REPORT_EMPTY_EVERY) { | |||
| reduceContext.consumeBucketsAndMaybeBreak(consumeBucketCount); | |||
There was a problem hiding this comment.
I think we should only do this is is final reduce?
| @@ -344,10 +349,14 @@ protected boolean lessThan(IteratorAndCurrent<Bucket> a, IteratorAndCurrent<Buck | |||
| final Bucket reduced = reduceBucket(currentBuckets, reduceContext); | |||
| if (reduced.getDocCount() >= minDocCount || reduceContext.isFinalReduce() == false) { | |||
| reducedBuckets.add(reduced); | |||
| if (consumeBucketCount++ >= REPORT_EMPTY_EVERY) { | |||
| reduceContext.consumeBucketsAndMaybeBreak(consumeBucketCount); | |||
There was a problem hiding this comment.
I think we should only do this is is final reduce?
iverase
approved these changes
Oct 18, 2023
Right in case of |
|
@elasticmachine run elasticsearch-ci/part-3 |
💚 Backport successful
|
martijnvg
added a commit
to martijnvg/elasticsearch
that referenced
this pull request
Oct 18, 2023
…01012) Adjust DateHistogram's consumeBucketsAndMaybeBreak to be iteratively during reduce instead accounting all buckets at the end of the reduce. In case of many non-empty buckets accounting the number of buckets at the end of the reduce may be too late. Elasticsearch may already have failed with an OOME. This change changes the accounting to happen iteratively during the reduce for non-empty bucket. Note that for empty buckets accounting of the number of buckets already happens iteratively.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 18, 2023
…101056) Adjust DateHistogram's consumeBucketsAndMaybeBreak to be iteratively during reduce instead accounting all buckets at the end of the reduce. In case of many non-empty buckets accounting the number of buckets at the end of the reduce may be too late. Elasticsearch may already have failed with an OOME. This change changes the accounting to happen iteratively during the reduce for non-empty bucket. Note that for empty buckets accounting of the number of buckets already happens iteratively.
martijnvg
added a commit
to martijnvg/elasticsearch
that referenced
this pull request
Nov 14, 2023
Adjust Histogram's consumeBucketsAndMaybeBreak to be iteratively during reduce instead accounting all buckets at the end of the reduce. In case of many non-empty buckets accounting the number of buckets at the end of the reduce may be too late. Elasticsearch may already have failed with an OOME. This change changes the accounting to happen iteratively during the reduce for non-empty bucket. Note that for empty buckets accounting of the number of buckets already happens iteratively. Similar to elastic#101012
martijnvg
added a commit
that referenced
this pull request
Nov 15, 2023
Adjust Histogram's consumeBucketsAndMaybeBreak to be iteratively during reduce instead accounting all buckets at the end of the reduce. In case of many non-empty buckets accounting the number of buckets at the end of the reduce may be too late. Elasticsearch may already have failed with an OOME. This change changes the accounting to happen iteratively during the reduce for non-empty bucket. Note that for empty buckets accounting of the number of buckets already happens iteratively. Similar to #101012
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.
Adjust DateHistogram's consumeBucketsAndMaybeBreak to be iteratively during reduce instead accounting all buckets at the end of the reduce.
In case of many non-empty buckets accounting the number of buckets at the end of the reduce may be too late. Elasticsearch may already have failed with an OOME. This change changes the accounting to happen iteratively during the reduce for non-empty bucket.
Note that for empty buckets accounting of the number of buckets already happens iteratively.