Purge hits on CBE

andreidan · andreidan · commit c10345199164 · 2025-02-08T10:19:35.000Z
diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseDocsIterator.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseDocsIterator.java
@@ -99,7 +99,10 @@ public final SearchHit[] iterate(
                     return partialSearchHits;
                 }
             }
-        } catch (SearchTimeoutException | CircuitBreakingException e) {
+        } catch (SearchTimeoutException e) {
+            throw e;
+        } catch (CircuitBreakingException e) {
+            purgeSearchHits(searchHits);
             throw e;
         } catch (Exception e) {
             purgeSearchHits(searchHits);

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,10 @@ public final SearchHit[] iterate(`
`99`	`99`	`return partialSearchHits;`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`- } catch (SearchTimeoutException \| CircuitBreakingException e) {`
	`102`	`+ } catch (SearchTimeoutException e) {`
	`103`	`+ throw e;`
	`104`	`+ } catch (CircuitBreakingException e) {`
	`105`	`+ purgeSearchHits(searchHits);`
`103`	`106`	`throw e;`
`104`	`107`	`} catch (Exception e) {`
`105`	`108`	`purgeSearchHits(searchHits);`