diff --git a/qa/lucene-index-compatibility/build.gradle b/qa/lucene-index-compatibility/build.gradle index 864d3e2e9f812..1d728c08dd6ff 100644 --- a/qa/lucene-index-compatibility/build.gradle +++ b/qa/lucene-index-compatibility/build.gradle @@ -14,6 +14,7 @@ buildParams.bwcVersions.withLatestReadOnlyIndexCompatible { bwcVersion -> tasks.named("javaRestTest").configure { systemProperty("tests.minimum.index.compatible", bwcVersion) usesBwcDistribution(bwcVersion) + enabled = true } } diff --git a/qa/lucene-index-compatibility/src/javaRestTest/java/org/elasticsearch/lucene/AbstractIndexCompatibilityTestCase.java b/qa/lucene-index-compatibility/src/javaRestTest/java/org/elasticsearch/lucene/AbstractIndexCompatibilityTestCase.java index d1a44235a3ced..a271c76bbc96e 100644 --- a/qa/lucene-index-compatibility/src/javaRestTest/java/org/elasticsearch/lucene/AbstractIndexCompatibilityTestCase.java +++ b/qa/lucene-index-compatibility/src/javaRestTest/java/org/elasticsearch/lucene/AbstractIndexCompatibilityTestCase.java @@ -26,7 +26,9 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.test.XContentTestUtils; import org.elasticsearch.test.cluster.ElasticsearchCluster; +import org.elasticsearch.test.cluster.local.DefaultSettingsProvider; import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider; +import org.elasticsearch.test.cluster.local.LocalClusterSpec; import org.elasticsearch.test.cluster.local.distribution.DistributionType; import org.elasticsearch.test.cluster.util.Version; import org.elasticsearch.test.rest.ESRestTestCase; @@ -78,6 +80,16 @@ public abstract class AbstractIndexCompatibilityTestCase extends ESRestTestCase .setting("xpack.security.enabled", "false") .setting("xpack.ml.enabled", "false") .setting("path.repo", () -> REPOSITORY_PATH.getRoot().getPath()) + .settings(new DefaultSettingsProvider() { + @Override + public Map get(LocalClusterSpec.LocalNodeSpec nodeSpec) { + var settings = super.get(nodeSpec); + if (nodeSpec.getVersion().onOrAfter(Version.fromString("9.2.0"))) { + settings.put("xpack.inference.endpoint.cache.enabled", "false"); + } + return settings; + } + }) .apply(() -> clusterConfig) .build(); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ClearInferenceEndpointCacheAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ClearInferenceEndpointCacheAction.java index ceeb5a56b8f2d..1d79b41ecc5e3 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ClearInferenceEndpointCacheAction.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ClearInferenceEndpointCacheAction.java @@ -104,6 +104,15 @@ public ClearInferenceEndpointCacheAction( ); } + @Override + protected void doExecute(Task task, Request request, ActionListener listener) { + if (inferenceEndpointRegistry.cacheEnabled() == false) { + ActionListener.completeWith(listener, () -> AcknowledgedResponse.TRUE); + return; + } + super.doExecute(task, request, listener); + } + @Override protected void masterOperation( Task task,