Skip to content

Commit b4a5817

Browse files
authored
[ML] Unmute MLModelDeploymentFullClusterRestartIT.testDeploymentSurvivesRestart (#115060)
After several hundreds of iterations of ``` ./gradlew ":x-pack:qa:full-cluster-restart:v8.0.1#bwcTest" -Dtests.class="org.elasticsearch.xpack.restart.MLModelDeploymentFullClusterRestartIT" -Dtests.method="testDeploymentSurvivesRestart" -Dtests.seed=A7BE2CA36E251E1E -Dtests.bwc=true -Dtests.locale=af-ZA -Dtests.timezone=Antarctica/South_Pole -Druntime.java=22 ``` No failures were observed. Given the location of the failure mentioned in #112980 it was likely due to a timeout on a busy CI machine. Just in case I've bumped the timeout in the busy wait loop. Also removed the now unneeded `@UpdateForV9` annotation in passing. Closes #112980
1 parent b2a2a53 commit b4a5817

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@ tests:
214214
issue: https://github.com/elastic/elasticsearch/issues/113722
215215
- class: org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDateNanosTests
216216
issue: https://github.com/elastic/elasticsearch/issues/113661
217-
- class: org.elasticsearch.xpack.restart.MLModelDeploymentFullClusterRestartIT
218-
method: testDeploymentSurvivesRestart {cluster=UPGRADED}
219-
issue: https://github.com/elastic/elasticsearch/issues/112980
220217
- class: org.elasticsearch.ingest.geoip.DatabaseNodeServiceIT
221218
method: testNonGzippedDatabase
222219
issue: https://github.com/elastic/elasticsearch/issues/113821

x-pack/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/restart/MLModelDeploymentFullClusterRestartIT.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import org.elasticsearch.common.xcontent.support.XContentMapValues;
1919
import org.elasticsearch.core.RestApiVersion;
2020
import org.elasticsearch.core.Strings;
21-
import org.elasticsearch.core.UpdateForV9;
22-
import org.elasticsearch.test.rest.RestTestLegacyFeatures;
2321
import org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus;
2422
import org.elasticsearch.xcontent.XContentType;
2523
import org.elasticsearch.xpack.core.ml.inference.assignment.AllocationStatus;
@@ -93,9 +91,6 @@ protected Settings restClientSettings() {
9391
}
9492

9593
public void testDeploymentSurvivesRestart() throws Exception {
96-
@UpdateForV9(owner = UpdateForV9.Owner.MACHINE_LEARNING) // condition will always be true from v8, can be removed
97-
var originalClusterSupportsNlpModels = oldClusterHasFeature(RestTestLegacyFeatures.ML_NLP_SUPPORTED);
98-
assumeTrue("NLP model deployments added in 8.0", originalClusterSupportsNlpModels);
9994

10095
String modelId = "trained-model-full-cluster-restart";
10196

@@ -139,7 +134,7 @@ private void waitForDeploymentStarted(String modelId) throws Exception {
139134
equalTo("fully_allocated")
140135
);
141136
assertThat(stat.toString(), XContentMapValues.extractValue("deployment_stats.state", stat), equalTo("started"));
142-
}, 90, TimeUnit.SECONDS);
137+
}, 120, TimeUnit.SECONDS);
143138
}
144139

145140
private void assertInfer(String modelId) throws IOException {

0 commit comments

Comments
 (0)