Skip to content

Commit d3d2205

Browse files
committed
Update assert to account for fetch phase tripping the cb
1 parent 3c57ced commit d3d2205

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
7979
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
8080
import static org.hamcrest.Matchers.containsString;
81+
import static org.hamcrest.Matchers.either;
8182
import static org.hamcrest.Matchers.equalTo;
8283

8384
public class TransportSearchIT extends ESIntegTestCase {
@@ -487,7 +488,10 @@ public void onFailure(Exception e) {
487488
Exception.class,
488489
client.prepareSearch("test").addAggregation(new TestAggregationBuilder("test"))
489490
);
490-
assertThat(exc.getCause().getMessage(), containsString("<reduce_aggs>"));
491+
assertThat(
492+
exc.getCause().getMessage(),
493+
either(containsString("<reduce_aggs>")).or(containsString("fetch phase source loader"))
494+
);
491495
});
492496

493497
final AtomicArray<Exception> exceptions = new AtomicArray<>(10);
@@ -514,7 +518,10 @@ public void onFailure(Exception exc) {
514518
latch.await();
515519
assertThat(exceptions.asList().size(), equalTo(10));
516520
for (Exception exc : exceptions.asList()) {
517-
assertThat(exc.getCause().getMessage(), containsString("<reduce_aggs>"));
521+
assertThat(
522+
exc.getCause().getMessage(),
523+
either(containsString("<reduce_aggs>")).or(containsString("fetch phase source loader"))
524+
);
518525
}
519526
assertBusy(() -> assertThat(requestBreakerUsed(), equalTo(0L)));
520527
} finally {

0 commit comments

Comments
 (0)