Skip to content

only return deprecation warning for elser service (#114507) #114770

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 2 commits into from
Oct 14, 2024
Merged

only return deprecation warning for elser service (#114507) #114770

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
718dde1
only return deprecation warning for elser service (#114507)
maxhniebergall Oct 14, 2024
e2d0cd8
Merge branch '8.x' into backport/fixElasticsearchServiceBug
elasticmachine Oct 14, 2024
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
23 changes: 14 additions & 9 deletions ...rg/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ public void parseRequestConfig(
config,
preferredModelVariant,
serviceSettingsMap,
true,
chunkingSettings,
modelListener
)
Expand Down Expand Up @@ -181,6 +182,7 @@ public void parseRequestConfig(
config,
preferredModelVariant,
serviceSettingsMap,
OLD_ELSER_SERVICE_NAME.equals(serviceName),
chunkingSettings,
modelListener
)
Expand Down Expand Up @@ -340,6 +342,7 @@ private void elserCase(
Map<String, Object> config,
PreferredModelVariant preferredModelVariant,
Map<String, Object> serviceSettingsMap,
boolean isElserService,
ChunkingSettings chunkingSettings,
ActionListener<Model> modelListener
) {
Expand Down Expand Up @@ -370,15 +373,17 @@ private void elserCase(
}
}

DEPRECATION_LOGGER.warn(
DeprecationCategory.API,
"inference_api_elser_service",
"The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
+ " [model_id] set to [{}] in the [service_settings]",
OLD_ELSER_SERVICE_NAME,
ElasticsearchInternalService.NAME,
defaultModelId
);
if (isElserService) {
DEPRECATION_LOGGER.warn(
DeprecationCategory.API,
"inference_api_elser_service",
"The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
+ " [model_id] set to [{}] in the [service_settings]",
OLD_ELSER_SERVICE_NAME,
ElasticsearchInternalService.NAME,
defaultModelId
);
}

throwIfNotEmptyMap(config, name());
throwIfNotEmptyMap(serviceSettingsMap, name());
Expand Down