Skip to content

Do not let ShardBulkInferenceActionFilter unwrap / rewrap ESExceptions #123890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 7, 2025
Merged

Do not let ShardBulkInferenceActionFilter unwrap / rewrap ESExceptions #123890

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c2d0793
do not let ShardBulkInferenceActionFilter unwrap / rewrap ESExceptions
tteofili Mar 3, 2025
8927706
Merge branch 'main' of github.com:elastic/elasticsearch into shardbul…
tteofili Mar 4, 2025
6b1c2ab
Update docs/changelog/123890.yaml
tteofili Mar 5, 2025
c123381
Add new InferenceException, exposing status by wrapped execption
tteofili Mar 5, 2025
bff5edc
Merge branch 'shardbulk_bubbleup_exceptions1' of github.com:tteofili/…
tteofili Mar 5, 2025
70948df
Merge branch 'main' of github.com:elastic/elasticsearch into shardbul…
tteofili Mar 5, 2025
79c704c
used inherited #status
tteofili Mar 6, 2025
13885ba
extended testItemFailures
tteofili Mar 6, 2025
24a97e1
spotless
tteofili Mar 6, 2025
ec0da9e
Merge branch 'main' of github.com:elastic/elasticsearch into shardbul…
tteofili Mar 6, 2025
0d9ef13
minor test fix
tteofili Mar 7, 2025
e6a5ad5
Merge branch 'main' of github.com:elastic/elasticsearch into shardbul…
tteofili Mar 7, 2025
11759e7
minor test fix
tteofili Mar 7, 2025
4dec72f
spotless
tteofili Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions .../java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,14 @@ public void onFailure(Exception exc) {
request.field
);
} else {
failure = new ElasticsearchException(
"Error loading inference for inference id [{}] on field [{}]",
exc,
inferenceId,
request.field
);
failure = exc instanceof ElasticsearchException
? exc
: new ElasticsearchException(
"Error loading inference for inference id [{}] on field [{}]",
exc,
inferenceId,
request.field
);
}
inferenceResults.get(request.index).failures.add(failure);
}
Expand All @@ -319,12 +321,14 @@ public void onResponse(List<ChunkedInference> results) {
var acc = inferenceResults.get(request.index);
if (result instanceof ChunkedInferenceError error) {
acc.addFailure(
new ElasticsearchException(
"Exception when running inference id [{}] on field [{}]",
error.exception(),
inferenceProvider.model.getInferenceEntityId(),
request.field
)
error.exception() instanceof ElasticsearchException
? error.exception()
: new ElasticsearchException(
"Exception when running inference id [{}] on field [{}]",
error.exception(),
inferenceProvider.model.getInferenceEntityId(),
request.field
)
);
} else {
acc.addOrUpdateResponse(
Expand All @@ -351,12 +355,14 @@ public void onFailure(Exception exc) {
for (FieldInferenceRequest request : requests) {
addInferenceResponseFailure(
request.index,
new ElasticsearchException(
"Exception when running inference id [{}] on field [{}]",
exc,
inferenceProvider.model.getInferenceEntityId(),
request.field
)
exc instanceof ElasticsearchException
? exc
: new ElasticsearchException(
"Exception when running inference id [{}] on field [{}]",
exc,
inferenceProvider.model.getInferenceEntityId(),
request.field
)
);
}
} finally {
Expand Down