Skip to content

Commit edaeebe

Browse files
committed
FetchPhase doc iterator lets CircuitBreakingException bubble up
1 parent 8b1f8c1 commit edaeebe

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseDocsIterator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.apache.lucene.index.IndexReader;
1313
import org.apache.lucene.index.LeafReaderContext;
1414
import org.apache.lucene.index.ReaderUtil;
15+
import org.elasticsearch.common.breaker.CircuitBreakingException;
1516
import org.elasticsearch.search.SearchHit;
1617
import org.elasticsearch.search.SearchHits;
1718
import org.elasticsearch.search.SearchShardTarget;
@@ -98,7 +99,7 @@ public final SearchHit[] iterate(
9899
return partialSearchHits;
99100
}
100101
}
101-
} catch (SearchTimeoutException e) {
102+
} catch (SearchTimeoutException | CircuitBreakingException e) {
102103
throw e;
103104
} catch (Exception e) {
104105
purgeSearchHits(searchHits);

0 commit comments

Comments
 (0)