Skip to content

Fix CPU stall in geotile_grid aggregation (#20413) #20461

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

Open
CodeItAlone wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix CPU stall in geotile_grid aggregation (#20413) #20461

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
12 changes: 12 additions & 0 deletions ...rc/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoGridAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@

package org.opensearch.geo.search.aggregations.bucket.geogrid;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.search.ScoreMode;
Expand All @@ -57,7 +59,9 @@
*
* @opensearch.api
*/

public abstract class GeoGridAggregator<T extends BaseGeoGrid> extends BucketsAggregator {
private static final Logger logger = LogManager.getLogger(GeoGridAggregator.class);

protected final int requiredSize;
protected final int shardSize;
Expand Down Expand Up @@ -94,13 +98,21 @@ public ScoreMode scoreMode() {
public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, final LeafBucketCollector sub) throws IOException {
SortedNumericDocValues values = valuesSource.longValues(ctx);
return new LeafBucketCollectorBase(sub, null) {
final int MAX_TILES_PER_DOCUMENT = 10000;

@Override
public void collect(int doc, long owningBucketOrd) throws IOException {
if (values.advanceExact(doc)) {
final int valuesCount = values.docValueCount();

if (valuesCount > MAX_TILES_PER_DOCUMENT) {
// Log a warning so the user knows why data is missing
logger.warn("Skipping doc [{}] in aggregation [{}] due to excessive tiles: [{}]", doc, name, valuesCount);
Copy link
Member

@andrross andrross Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A user is unlikely to see the server-side logs. Instead they will see their query complete with no indication that they are getting incomplete/incorrect results.

return;
}
long previous = Long.MAX_VALUE;
for (int i = 0; i < valuesCount; ++i) {

final long val = values.nextValue();
if (previous != val || i == 0) {
long bucketOrdinal = bucketOrds.add(owningBucketOrd, val);
Expand Down