From 4ebc91735b462a082a2b1e27d85782966bed17bb Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Fri, 28 Mar 2025 18:02:37 +0000 Subject: [PATCH 1/3] Fix test --- .../registry/ModelRegistryMetadataTests.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java index 130016dd1696d..c5097bc1af697 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java @@ -22,16 +22,17 @@ import java.util.Map; import java.util.Set; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; public class ModelRegistryMetadataTests extends AbstractChunkedSerializingTestCase { public static ModelRegistryMetadata randomInstance() { - return randomInstance(randomBoolean()); + return randomInstance(randomBoolean(), true); } - public static ModelRegistryMetadata randomInstance(boolean isUpgraded) { - if (rarely() && isUpgraded == false) { - return ModelRegistryMetadata.EMPTY; + public static ModelRegistryMetadata randomInstance(boolean isUpgraded, boolean acceptsEmpty) { + if (rarely() && acceptsEmpty) { + return isUpgraded ? ModelRegistryMetadata.EMPTY_UPGRADED : ModelRegistryMetadata.EMPTY; } int size = randomIntBetween(1, 5); @@ -82,7 +83,7 @@ protected Writeable.Reader instanceReader() { } public void testUpgrade() { - var metadata = randomInstance(false); + var metadata = randomInstance(false, false); var metadataWithTombstones = metadata.withRemovedModel(Set.of(randomFrom(metadata.getModelMap().keySet()))); var indexMetadata = metadata.withAddedModel(randomAlphanumericOfLength(10), MinimalServiceSettingsTests.randomInstance()); @@ -99,9 +100,10 @@ public void testUpgrade() { } public void testAlreadyUpgraded() { - var metadata = randomInstance(true); - var indexMetadata = randomInstance(true); + var metadata = randomInstance(true, true); + var indexMetadata = randomInstance(true, true); var exc = expectThrows(IllegalArgumentException.class, () -> metadata.withUpgradedModels(indexMetadata.getModelMap())); + assertThat(exc.getMessage(), containsString("upgraded")); } } From 7ecccae9f2d619ff599429ca3c41bfb267d0aacd Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Fri, 28 Mar 2025 18:03:00 +0000 Subject: [PATCH 2/3] Fix test --- .../xpack/inference/registry/ModelRegistryMetadata.java | 5 +++-- .../xpack/inference/registry/ModelRegistryMetadataTests.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadata.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadata.java index 57cd7747737c5..5ed5ebdfd1993 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadata.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadata.java @@ -51,7 +51,8 @@ public class ModelRegistryMetadata implements Metadata.ProjectCustom { public static final String TYPE = "model_registry"; - public static final ModelRegistryMetadata EMPTY = new ModelRegistryMetadata(ImmutableOpenMap.of(), Set.of()); + public static final ModelRegistryMetadata EMPTY_NOT_UPGRADED = new ModelRegistryMetadata(ImmutableOpenMap.of(), Set.of()); + public static final ModelRegistryMetadata EMPTY_UPGRADED = new ModelRegistryMetadata(ImmutableOpenMap.of()); private static final ParseField UPGRADED_FIELD = new ParseField("upgraded"); private static final ParseField MODELS_FIELD = new ParseField("models"); @@ -87,7 +88,7 @@ public class ModelRegistryMetadata implements Metadata.ProjectCustom { public static ModelRegistryMetadata fromState(ProjectMetadata projectMetadata) { ModelRegistryMetadata resp = projectMetadata.custom(TYPE); - return resp != null ? resp : EMPTY; + return resp != null ? resp : EMPTY_NOT_UPGRADED; } public ModelRegistryMetadata withAddedModel(String inferenceEntityId, MinimalServiceSettings settings) { diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java index c5097bc1af697..19af5ad61b988 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java @@ -32,7 +32,7 @@ public static ModelRegistryMetadata randomInstance() { public static ModelRegistryMetadata randomInstance(boolean isUpgraded, boolean acceptsEmpty) { if (rarely() && acceptsEmpty) { - return isUpgraded ? ModelRegistryMetadata.EMPTY_UPGRADED : ModelRegistryMetadata.EMPTY; + return isUpgraded ? ModelRegistryMetadata.EMPTY_UPGRADED : ModelRegistryMetadata.EMPTY_NOT_UPGRADED; } int size = randomIntBetween(1, 5); From 3f00e8c0d7c4391d9fb6942b2cc40c246ff011c9 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Fri, 28 Mar 2025 18:03:56 +0000 Subject: [PATCH 3/3] unmute test --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index b48e57218a715..3383eed83598a 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -389,9 +389,6 @@ tests: - class: org.elasticsearch.xpack.ilm.TimeSeriesDataStreamsIT method: testSearchableSnapshotAction issue: https://github.com/elastic/elasticsearch/issues/125867 -- class: org.elasticsearch.xpack.inference.registry.ModelRegistryMetadataTests - method: testUpgrade - issue: https://github.com/elastic/elasticsearch/issues/125554 # Examples: #