From 5cdb8b0b565a6811f61991a7ac8988d6f7c2e1b0 Mon Sep 17 00:00:00 2001 From: Michail Romaios Date: Fri, 18 Jul 2025 13:53:23 +0200 Subject: [PATCH 1/5] refactor: enhance semantic_text inference error msg --- .../action/filter/ShardBulkInferenceActionFilter.java | 8 ++++++-- .../filter/ShardBulkInferenceActionFilterTests.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java index 3127361de6d11..e2fd106d48d33 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java @@ -637,7 +637,9 @@ private boolean incrementIndexingPressure(IndexRequestWithIndexingPressure index addInferenceResponseFailure( itemIndex, new InferenceException( - "Insufficient memory available to update source on document [" + indexRequest.getIndexRequest().id() + "]", + "Unable to insert inference results into document [" + + indexRequest.indexRequest.id() + + "] due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.", e ) ); @@ -749,7 +751,9 @@ private void applyInferenceResponses(BulkItemRequest item, FieldInferenceRespons item.abort( item.index(), new InferenceException( - "Insufficient memory available to insert inference results into document [" + indexRequest.id() + "]", + "Unable to insert inference results into document [" + + indexRequest.id() + + "] due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.", e ) ); diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java index 5b4925d8fb0a3..32992cafad3f0 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java @@ -709,7 +709,8 @@ public void testIndexingPressureTripsOnInferenceRequestGeneration() throws Excep BulkItemResponse.Failure doc1Failure = doc1Response.getFailure(); assertThat( doc1Failure.getCause().getMessage(), - containsString("Insufficient memory available to update source on document [doc_1]") + containsString("Unable to insert inference results into document [doc_1]" + + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.") ); assertThat(doc1Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); assertThat(doc1Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS)); From c42155c8e063e2e356c248eb10bf3061c77c696a Mon Sep 17 00:00:00 2001 From: Michail Romaios Date: Fri, 18 Jul 2025 13:56:31 +0200 Subject: [PATCH 2/5] use getter --- .../inference/action/filter/ShardBulkInferenceActionFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java index e2fd106d48d33..ca55434454422 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java @@ -638,7 +638,7 @@ private boolean incrementIndexingPressure(IndexRequestWithIndexingPressure index itemIndex, new InferenceException( "Unable to insert inference results into document [" - + indexRequest.indexRequest.id() + + indexRequest.getIndexRequest().id() + "] due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.", e ) From fc0d908dbedd406c17d9f16b7e6fcf15b4ffcb38 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 18 Jul 2025 12:06:34 +0000 Subject: [PATCH 3/5] [CI] Auto commit changes from spotless --- .../action/filter/ShardBulkInferenceActionFilterTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java index 32992cafad3f0..3d1161d584eec 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java @@ -709,8 +709,10 @@ public void testIndexingPressureTripsOnInferenceRequestGeneration() throws Excep BulkItemResponse.Failure doc1Failure = doc1Response.getFailure(); assertThat( doc1Failure.getCause().getMessage(), - containsString("Unable to insert inference results into document [doc_1]" - + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.") + containsString( + "Unable to insert inference results into document [doc_1]" + + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes." + ) ); assertThat(doc1Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); assertThat(doc1Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS)); From 38379420502d1c25e2617f04e575bb63232adc5d Mon Sep 17 00:00:00 2001 From: Michail Romaios Date: Fri, 18 Jul 2025 14:10:11 +0200 Subject: [PATCH 4/5] update tests --- .../action/filter/ShardBulkInferenceActionFilterTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java index 32992cafad3f0..45c99ce55ade2 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java @@ -792,7 +792,8 @@ public void testIndexingPressureTripsOnInferenceResponseHandling() throws Except BulkItemResponse.Failure doc1Failure = doc1Response.getFailure(); assertThat( doc1Failure.getCause().getMessage(), - containsString("Insufficient memory available to insert inference results into document [doc_1]") + containsString("Unable to insert inference results into document [doc_1]" + + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.") ); assertThat(doc1Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); assertThat(doc1Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS)); @@ -903,7 +904,8 @@ public void testIndexingPressurePartialFailure() throws Exception { BulkItemResponse.Failure doc2Failure = doc2Response.getFailure(); assertThat( doc2Failure.getCause().getMessage(), - containsString("Insufficient memory available to insert inference results into document [doc_2]") + containsString("Unable to insert inference results into document [doc_2]" + + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.") ); assertThat(doc2Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); assertThat(doc2Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS)); From 04d4e6a82c65ddeb8420ff31a58cbcb2ae17634a Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 18 Jul 2025 12:21:58 +0000 Subject: [PATCH 5/5] [CI] Auto commit changes from spotless --- .../filter/ShardBulkInferenceActionFilterTests.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java index 0aecc6eda7986..08334de00543d 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java @@ -794,8 +794,10 @@ public void testIndexingPressureTripsOnInferenceResponseHandling() throws Except BulkItemResponse.Failure doc1Failure = doc1Response.getFailure(); assertThat( doc1Failure.getCause().getMessage(), - containsString("Unable to insert inference results into document [doc_1]" - + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.") + containsString( + "Unable to insert inference results into document [doc_1]" + + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes." + ) ); assertThat(doc1Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); assertThat(doc1Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS)); @@ -906,8 +908,10 @@ public void testIndexingPressurePartialFailure() throws Exception { BulkItemResponse.Failure doc2Failure = doc2Response.getFailure(); assertThat( doc2Failure.getCause().getMessage(), - containsString("Unable to insert inference results into document [doc_2]" - + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes.") + containsString( + "Unable to insert inference results into document [doc_2]" + + " due to memory pressure. Please retry the bulk request with fewer documents or smaller document sizes." + ) ); assertThat(doc2Failure.getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); assertThat(doc2Failure.getStatus(), is(RestStatus.TOO_MANY_REQUESTS));