Skip to content
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

Jump to bottom

Early terminate the slices for concurrent search if CircuitBreakingException is thrown #11731

Closed
wants to merge 1 commit into from
Closed

Early terminate the slices for concurrent search if CircuitBreakingException is thrown #11731

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
import org.opensearch.common.annotation.PublicApi;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
import org.opensearch.core.common.breaker.CircuitBreakingException;
import org.opensearch.search.DocValueFormat;
import org.opensearch.search.SearchService;
import org.opensearch.search.dfs.AggregatedDfs;
Expand Down Expand Up @@ -269,6 +270,11 @@

@Override
protected void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {

if (searchContext.isCircuitBreakerTripped()) {
return;

Check warning on line 275 in server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java#L275 

Added line #L275 was not covered by tests
}

// Time series based workload by default traverses segments in desc order i.e. latest to the oldest order.
// This is actually beneficial for search queries to start search on latest segments first for time series workload.
// That can slow down ASC order queries on timestamp workload. So to avoid that slowdown, we will reverse leaf
Expand Down Expand Up @@ -297,6 +303,9 @@
if (canMatch(ctx) == false) {
return;
}
if (searchContext.isCircuitBreakerTripped()) {
return;

Check warning on line 307 in server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java#L307 

Added line #L307 was not covered by tests
}

final LeafCollector leafCollector;
try {
Expand All @@ -315,6 +324,9 @@
} catch (QueryPhase.TimeExceededException e) {
searchContext.setSearchTimedOut(true);
return;
} catch (CircuitBreakingException e) {
searchContext.setCircuitBreakerTripped(true);
return;

Check warning on line 329 in server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java#L327-L329 

Added lines #L327 - L329 were not covered by tests
}
// catch early terminated exception and rethrow?
Bits liveDocs = ctx.reader().getLiveDocs();
Expand All @@ -330,6 +342,9 @@
} catch (QueryPhase.TimeExceededException e) {
searchContext.setSearchTimedOut(true);
return;
} catch (CircuitBreakingException e) {
searchContext.setCircuitBreakerTripped(true);
return;

Check warning on line 347 in server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java#L345-L347 

Added lines #L345 - L347 were not covered by tests
}
}
} else {
Expand All @@ -349,6 +364,9 @@
} catch (QueryPhase.TimeExceededException e) {
searchContext.setSearchTimedOut(true);
return;
} catch (CircuitBreakingException e) {
searchContext.setCircuitBreakerTripped(true);
return;

Check warning on line 369 in server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java#L367-L369 

Added lines #L367 - L369 were not covered by tests
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions server/src/main/java/org/opensearch/search/internal/SearchContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
private InnerHitsContext innerHitsContext;

private volatile boolean searchTimedOut;
private volatile boolean circuitBreakerTripped;

protected SearchContext() {}

Expand All @@ -139,6 +140,14 @@
this.searchTimedOut = searchTimedOut;
}

public boolean isCircuitBreakerTripped() {
return circuitBreakerTripped;
}

public void setCircuitBreakerTripped(boolean circuitBreakerTripped) {
this.circuitBreakerTripped = circuitBreakerTripped;
}

Check warning on line 149 in server/src/main/java/org/opensearch/search/internal/SearchContext.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/SearchContext.java#L148-L149 

Added lines #L148 - L149 were not covered by tests

@Override
public final void close() {
if (closed.compareAndSet(false, true)) {
Expand Down
Loading