Skip to content

Commit

Permalink
[ML] Unmute MLModelDeploymentFullClusterRestartIT.testDeploymentSurvi…
Browse files Browse the repository at this point in the history
…vesRestart

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 elastic#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 elastic#112980
  • Loading branch information
edsavage committed Oct 18, 2024
1 parent 5bf446e commit 0a7c6c0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
3 changes: 0 additions & 3 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/113722
- class: org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDateNanosTests
issue: https://github.com/elastic/elasticsearch/issues/113661
- class: org.elasticsearch.xpack.restart.MLModelDeploymentFullClusterRestartIT
method: testDeploymentSurvivesRestart {cluster=UPGRADED}
issue: https://github.com/elastic/elasticsearch/issues/112980
- class: org.elasticsearch.ingest.geoip.DatabaseNodeServiceIT
method: testNonGzippedDatabase
issue: https://github.com/elastic/elasticsearch/issues/113821
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.core.RestApiVersion;
import org.elasticsearch.core.Strings;
import org.elasticsearch.core.UpdateForV9;
import org.elasticsearch.test.rest.RestTestLegacyFeatures;
import org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus;
import org.elasticsearch.xcontent.XContentType;
import org.elasticsearch.xpack.core.ml.inference.assignment.AllocationStatus;
Expand Down Expand Up @@ -93,9 +91,6 @@ protected Settings restClientSettings() {
}

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

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

Expand Down Expand Up @@ -139,7 +134,7 @@ private void waitForDeploymentStarted(String modelId) throws Exception {
equalTo("fully_allocated")
);
assertThat(stat.toString(), XContentMapValues.extractValue("deployment_stats.state", stat), equalTo("started"));
}, 90, TimeUnit.SECONDS);
}, 120, TimeUnit.SECONDS);
}

private void assertInfer(String modelId) throws IOException {
Expand Down

0 comments on commit 0a7c6c0

Please sign in to comment.