[Inference API] Update authorized endpoints when their fingerprint or version changed by dimitris-athanasiou · Pull Request #143567 · elastic/elasticsearch

dimitris-athanasiou · 2026-03-04T10:59:49Z

This PR modifies the AuthorizationPoller so that it selects to persist endpoints that:

are new
have a different fingerprint
have a newer version

Updating endpoints that have a different fingerprint allows dynamic updates when EIS modifies the endpoint metadata.

Updating endpoints that have a different version allows persisting EndpointMetadata fields that could not be parsed before.

In addition, in this PR I have removed the logic for handling out-of-sync endpoints added in #138934 as it is no longer needed. This was necessary for authorized endpoints only. For those, if they are not in cluster state we'll now overwrite the doc in the index and update the cluster state. This ammends the out-of-sync problem if it ever occurs.

… version changed This PR modifies the `AuthorizationPoller` so that it selects to persist endpoints that: - are new - have a different fingerprint - have a newer version Updating endpoints that have a different fingerprint allows dynamic updates when EIS modifies the endpoint metadata. Updating endpoints that have a different version allows persisting `EndpointMetadata` fields that could not be parsed before. In addition, in this PR I have removed the logic for handling out-of-sync endpoints added in elastic#138934 as it is no longer needed. This was necessary for authorized endpoints only. For those, if they are not in cluster state we'll now overwrite the doc in the index and update the cluster state. This ammends the out-of-sync problem if it ever occurs.

elasticsearchmachine · 2026-03-04T11:00:18Z

Pinging @elastic/search-inference-team (Team:Search - Inference)

elasticsearchmachine · 2026-03-04T11:00:22Z

Hi @dimitris-athanasiou, I've created a changelog YAML for you.

…r-version-change

jonathan-buttner

Looking good! Left a few questions and suggestions.

jonathan-buttner · 2026-03-04T15:30:51Z

...sterTest/java/org/elasticsearch/xpack/inference/integration/AuthorizationTaskExecutorIT.java

+        );
+    }
+
+    private void testEndpointGetsUpdated_GivenFingerprintChanged(String originalFingerprint, String updatedFingerprint) throws Exception {


Just a heads up I've struggled to get these type of tests to succeed reliably. A number of them have been muted: #138012

If you have time, another set of eyes would be good to figure out why they are so flaky. I've tried to fix them a few times 😞

I did notice those issues. I wonder if #143584 might have been some of that. But I couldn't find full logs. Next time we get a failure I'll dive in.

.../internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java

jonathan-buttner · 2026-03-04T19:00:44Z

...plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java


        var modelsWithoutDuplicates = models.stream().distinct().toList();

+        Set<String> duplicateInferenceIds = findDuplicateInferenceIds(modelsWithoutDuplicates);


In a situation where we receive multiple models with different definitions but the same inference id we could apply them all right? That certainly would be inefficient but I don't think it'd cause errors right? If we consider this functionality similar to elasticsearch's _bulk api I think we could return successes.

The handling we do here would need to change if we accepted duplicate models.

But I don't see anything that stops us from changing this. Then again, given this is only an internal action we control, I wonder if keeping the duplicate check would help us pick up some issue.

Not sure. Do you have a preference?

We have discussed this offline and decided to keep the duplicate id check in. In addition, we'll remove the var modelsWithoutDuplicates = models.stream().distinct().toList(); line as it is no longer necessary.

.../internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java

...plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java

…r-version-change

dimitris-athanasiou · 2026-03-05T17:40:10Z

@jonathan-buttner I have addressed review feedback. This is ready for another look.

jonathan-buttner · 2026-03-05T17:57:49Z

.../internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java

+        ResourceNotFoundException e = expectThrows(
+            ResourceNotFoundException.class,
+            () -> modelRegistry.getMinimalServiceSettings(
+                Set.of("model_id_" + randomIntBetween(0, createdModels.size() - 1), "non_matching_id"),


How about we move the string id logic to a helper method since we use it a couple times?

Done in ef46573

… version changed (elastic#143567) This PR modifies the `AuthorizationPoller` so that it selects to persist endpoints that: - are new - have a different fingerprint - have a newer version Updating endpoints that have a different fingerprint allows dynamic updates when EIS modifies the endpoint metadata. Updating endpoints that have a different version allows persisting `EndpointMetadata` fields that could not be parsed before. In addition, in this PR I have removed the logic for handling out-of-sync endpoints added in elastic#138934 as it is no longer needed. This was necessary for authorized endpoints only. For those, if they are not in cluster state we'll now overwrite the doc in the index and update the cluster state. This ammends the out-of-sync problem if it ever occurs.

This fixes debug log messages added in elastic#143567 where the endpoint id is not correctly included.

) This fixes debug log messages added in #143567 where the endpoint id is not correctly included.

… version changed (elastic#143567) This PR modifies the `AuthorizationPoller` so that it selects to persist endpoints that: - are new - have a different fingerprint - have a newer version Updating endpoints that have a different fingerprint allows dynamic updates when EIS modifies the endpoint metadata. Updating endpoints that have a different version allows persisting `EndpointMetadata` fields that could not be parsed before. In addition, in this PR I have removed the logic for handling out-of-sync endpoints added in elastic#138934 as it is no longer needed. This was necessary for authorized endpoints only. For those, if they are not in cluster state we'll now overwrite the doc in the index and update the cluster state. This ammends the out-of-sync problem if it ever occurs.

…tic#143743) This fixes debug log messages added in elastic#143567 where the endpoint id is not correctly included.

dimitris-athanasiou added >enhancement :SearchOrg/Inference Label for the Search Inference team v9.4.0 labels Mar 4, 2026

elasticsearchmachine added the Team:Search - Inference label Mar 4, 2026

Update docs/changelog/143567.yaml

6dc3907

dimitris-athanasiou requested a review from jonathan-buttner March 4, 2026 11:01

elasticsearchmachine and others added 5 commits March 4, 2026 11:07

[CI] Auto commit changes from spotless

08d1e18

Merge branch 'main' into update-authorized-endpoints-on-fingerprint-o…

5383624

…r-version-change

Merge branch 'main' into update-authorized-endpoints-on-fingerprint-o…

c5bbdd1

…r-version-change

Make integ test wait for endpoint to be updated

dce7a67

Merge branch 'main' into update-authorized-endpoints-on-fingerprint-o…

58e1aea

…r-version-change

jonathan-buttner reviewed Mar 4, 2026

View reviewed changes

dimitris-athanasiou added 3 commits March 5, 2026 19:31

Merge branch 'main' into update-authorized-endpoints-on-fingerprint-o…

f7f452a

…r-version-change

Address review feedback

8bbdf43

Remove distinct call in ModelRegistry.storeModels

b13c29c

jonathan-buttner approved these changes Mar 5, 2026

View reviewed changes

Function for generating endpoint id in test

ef46573

dimitris-athanasiou merged commit f5c3e5f into elastic:main Mar 6, 2026
35 checks passed

dimitris-athanasiou deleted the update-authorized-endpoints-on-fingerprint-or-version-change branch March 6, 2026 06:49

dimitris-athanasiou mentioned this pull request Mar 6, 2026

Correctly include endpoint id in log msg in AuthorizationPoller #143743

Merged

dimitris-athanasiou added a commit to dimitris-athanasiou/elasticsearch that referenced this pull request Mar 6, 2026

Correctly include endpoint id in log msg in AuthorizationPoller

0cb15e3

This fixes debug log messages added in elastic#143567 where the endpoint id is not correctly included.

dimitris-athanasiou added a commit that referenced this pull request Mar 6, 2026

Correctly include endpoint id in log msg in AuthorizationPoller (#143743

9db3d75

) This fixes debug log messages added in #143567 where the endpoint id is not correctly included.

prwhelan mentioned this pull request Mar 6, 2026

[ML] Wait for cluster state in test #143767

Merged

prwhelan mentioned this pull request Mar 9, 2026

[Transform] Disable PIT for CPS #143876

Closed


		var modelsWithoutDuplicates = models.stream().distinct().toList();

		Set<String> duplicateInferenceIds = findDuplicateInferenceIds(modelsWithoutDuplicates);

Conversation

dimitris-athanasiou commented Mar 4, 2026

Uh oh!

elasticsearchmachine commented Mar 4, 2026

Uh oh!

elasticsearchmachine commented Mar 4, 2026

Uh oh!

jonathan-buttner left a comment

Choose a reason for hiding this comment

Uh oh!

jonathan-buttner Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

dimitris-athanasiou Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jonathan-buttner Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

dimitris-athanasiou Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

dimitris-athanasiou Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dimitris-athanasiou commented Mar 5, 2026

Uh oh!

jonathan-buttner Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

dimitris-athanasiou Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants