Skip to content

Commit d70e2bd

Browse files
authored
Reenable Index Compatibility BWC Tests (#134784)
This change reenables N-2 BWC tests on main that were not reenabled in #125296. Tests are running on 9.0 though.
1 parent 9a3892f commit d70e2bd

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

qa/lucene-index-compatibility/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ buildParams.bwcVersions.withLatestReadOnlyIndexCompatible { bwcVersion ->
1414
tasks.named("javaRestTest").configure {
1515
systemProperty("tests.minimum.index.compatible", bwcVersion)
1616
usesBwcDistribution(bwcVersion)
17+
enabled = true
1718
}
1819
}
1920

qa/lucene-index-compatibility/src/javaRestTest/java/org/elasticsearch/lucene/AbstractIndexCompatibilityTestCase.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
import org.elasticsearch.index.mapper.MapperService;
2727
import org.elasticsearch.test.XContentTestUtils;
2828
import org.elasticsearch.test.cluster.ElasticsearchCluster;
29+
import org.elasticsearch.test.cluster.local.DefaultSettingsProvider;
2930
import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider;
31+
import org.elasticsearch.test.cluster.local.LocalClusterSpec;
3032
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
3133
import org.elasticsearch.test.cluster.util.Version;
3234
import org.elasticsearch.test.rest.ESRestTestCase;
@@ -78,6 +80,16 @@ public abstract class AbstractIndexCompatibilityTestCase extends ESRestTestCase
7880
.setting("xpack.security.enabled", "false")
7981
.setting("xpack.ml.enabled", "false")
8082
.setting("path.repo", () -> REPOSITORY_PATH.getRoot().getPath())
83+
.settings(new DefaultSettingsProvider() {
84+
@Override
85+
public Map<String, String> get(LocalClusterSpec.LocalNodeSpec nodeSpec) {
86+
var settings = super.get(nodeSpec);
87+
if (nodeSpec.getVersion().onOrAfter(Version.fromString("9.2.0"))) {
88+
settings.put("xpack.inference.endpoint.cache.enabled", "false");
89+
}
90+
return settings;
91+
}
92+
})
8193
.apply(() -> clusterConfig)
8294
.build();
8395

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ClearInferenceEndpointCacheAction.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,15 @@ public ClearInferenceEndpointCacheAction(
104104
);
105105
}
106106

107+
@Override
108+
protected void doExecute(Task task, Request request, ActionListener<AcknowledgedResponse> listener) {
109+
if (inferenceEndpointRegistry.cacheEnabled() == false) {
110+
ActionListener.completeWith(listener, () -> AcknowledgedResponse.TRUE);
111+
return;
112+
}
113+
super.doExecute(task, request, listener);
114+
}
115+
107116
@Override
108117
protected void masterOperation(
109118
Task task,

0 commit comments

Comments
 (0)