Skip to content

Commit a786c93

Browse files
authored
refactor: enhance semantic_text inference error msg (elastic#131519)
1 parent efa71d7 commit a786c93

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,9 @@ private boolean incrementIndexingPressure(IndexRequestWithIndexingPressure index
637637
addInferenceResponseFailure(
638638
itemIndex,
639639
new InferenceException(
640-
"Insufficient memory available to update source on document [" + indexRequest.getIndexRequest().id() + "]",
640+
"Unable to insert inference results into document ["
641+
+ indexRequest.getIndexRequest().id()
642+
+ "] due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.",
641643
e
642644
)
643645
);
@@ -749,7 +751,9 @@ private void applyInferenceResponses(BulkItemRequest item, FieldInferenceRespons
749751
item.abort(
750752
item.index(),
751753
new InferenceException(
752-
"Insufficient memory available to insert inference results into document [" + indexRequest.id() + "]",
754+
"Unable to insert inference results into document ["
755+
+ indexRequest.id()
756+
+ "] due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.",
753757
e
754758
)
755759
);

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,10 @@ public void testIndexingPressureTripsOnInferenceRequestGeneration() throws Excep
709709
BulkItemResponse.Failure doc1Failure = doc1Response.getFailure();
710710
assertThat(
711711
doc1Failure.getCause().getMessage(),
712-
containsString("Insufficient memory available to update source on document [doc_1]")
712+
containsString(
713+
"Unable to insert inference results into document [doc_1]"
714+
+ " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes."
715+
)
713716
);
714717
assertThat(doc1Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class));
715718
assertThat(doc1Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS));
@@ -791,7 +794,10 @@ public void testIndexingPressureTripsOnInferenceResponseHandling() throws Except
791794
BulkItemResponse.Failure doc1Failure = doc1Response.getFailure();
792795
assertThat(
793796
doc1Failure.getCause().getMessage(),
794-
containsString("Insufficient memory available to insert inference results into document [doc_1]")
797+
containsString(
798+
"Unable to insert inference results into document [doc_1]"
799+
+ " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes."
800+
)
795801
);
796802
assertThat(doc1Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class));
797803
assertThat(doc1Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS));
@@ -902,7 +908,10 @@ public void testIndexingPressurePartialFailure() throws Exception {
902908
BulkItemResponse.Failure doc2Failure = doc2Response.getFailure();
903909
assertThat(
904910
doc2Failure.getCause().getMessage(),
905-
containsString("Insufficient memory available to insert inference results into document [doc_2]")
911+
containsString(
912+
"Unable to insert inference results into document [doc_2]"
913+
+ " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes."
914+
)
906915
);
907916
assertThat(doc2Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class));
908917
assertThat(doc2Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS));

0 commit comments

Comments
 (0)