Skip to content

[ML] Switch ModelRegistry to return ResourceyAlreadyExistsException instead of ElasticsearchStatusException #137525

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
jonathan-buttner merged 3 commits into from
Nov 3, 2025
Merged

[ML] Switch ModelRegistry to return ResourceyAlreadyExistsException instead of ElasticsearchStatusException #137525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a4b620
Use resource already exists exception to avoid logging error message
jonathan-buttner Nov 3, 2025
3d78127
Merge branch 'main' into ml-fix-resource-exists
jonathan-buttner Nov 3, 2025
cd1cec3
Merge branch 'main' into ml-fix-resource-exists
jonathan-buttner Nov 3, 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
7 changes: 4 additions & 3 deletions ...ternalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.elasticsearch.xpack.inference.integration;

import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.ResourceAlreadyExistsException;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.ActionListener;
Expand Down Expand Up @@ -906,7 +907,7 @@ public void testStoreModel_ThrowsException_WhenFailureIsAVersionConflict() {
var model = TestModel.createRandomInstance();
assertStoreModel(modelRegistry, model);

var exception = expectThrows(ElasticsearchStatusException.class, () -> assertStoreModel(modelRegistry, model));
var exception = expectThrows(ResourceAlreadyExistsException.class, () -> assertStoreModel(modelRegistry, model));
assertThat(exception.status(), Matchers.is(RestStatus.BAD_REQUEST));
assertThat(
exception.getMessage(),
Expand Down Expand Up @@ -941,7 +942,7 @@ public void testStoreModel_DoesNotDeleteIndexDocs_WhenModelAlreadyExists() {
PlainActionFuture<Boolean> secondStoreListener = new PlainActionFuture<>();
modelRegistry.storeModel(model, secondStoreListener, TimeValue.THIRTY_SECONDS);

var exception = expectThrows(ElasticsearchStatusException.class, () -> secondStoreListener.actionGet(TimeValue.THIRTY_SECONDS));
var exception = expectThrows(ResourceAlreadyExistsException.class, () -> secondStoreListener.actionGet(TimeValue.THIRTY_SECONDS));
assertThat(exception.getMessage(), containsString("already exists"));
assertThat(exception.status(), Matchers.is(RestStatus.BAD_REQUEST));
assertIndicesContainExpectedDocsCount(model, 2);
Expand All @@ -964,7 +965,7 @@ private void storeCorruptedModelThenStoreModel(boolean storeSecrets) {
PlainActionFuture<Boolean> storeListener = new PlainActionFuture<>();
modelRegistry.storeModel(model, storeListener, TimeValue.THIRTY_SECONDS);

var exception = expectThrows(ElasticsearchStatusException.class, () -> storeListener.actionGet(TimeValue.THIRTY_SECONDS));
var exception = expectThrows(ResourceAlreadyExistsException.class, () -> storeListener.actionGet(TimeValue.THIRTY_SECONDS));
assertThat(exception.getMessage(), containsString("already exists"));
assertThat(exception.status(), Matchers.is(RestStatus.BAD_REQUEST));

Expand Down
9 changes: 1 addition & 8 deletions ...gin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,14 +670,7 @@ private void storeModel(Model model, boolean updateClusterState, ActionListener<

var failureItem = firstFailureResponse.get();
if (ExceptionsHelper.unwrapCause(failureItem.failureCause()) instanceof VersionConflictEngineException) {
delegate.onFailure(
new ElasticsearchStatusException(
"Inference endpoint [{}] already exists",
RestStatus.BAD_REQUEST,
failureItem.failureCause(),
failureItem.inferenceId()
)
);
delegate.onFailure(new ResourceAlreadyExistsException("Inference endpoint [{}] already exists", failureItem.inferenceId()));
return;
}

Expand Down