Skip to content

Fix ComponentTemplatesFileSettingsIT.testSettingsApplied #137669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2025
Merged

Fix ComponentTemplatesFileSettingsIT.testSettingsApplied #137669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,6 @@ tests:
- class: org.elasticsearch.xpack.inference.DefaultEndPointsIT
method: testMultipleInferencesTriggeringDownloadAndDeploy
issue: https://github.com/elastic/elasticsearch/issues/117208
- class: org.elasticsearch.reservedstate.service.ComponentTemplatesFileSettingsIT
method: testSettingsApplied
issue: https://github.com/elastic/elasticsearch/issues/137258
- class: org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT
method: test {p0=esql/40_tsdb/error on rename timestamp}
issue: https://github.com/elastic/elasticsearch/issues/137259
Expand Down
4 changes: 2 additions & 2 deletions ...erTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS);
assertTrue(awaitSuccessful);

awaitMasterNode();
final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
).actionGet();
Expand Down Expand Up @@ -532,8 +533,7 @@ public void testSettingsApplied() throws Exception {
writeJSONFile(dataNode, testJSON);

logger.info("--> start master node");
final String masterNode = internalCluster().startMasterOnlyNode();
awaitMasterNode(internalCluster().getNonMasterNodeName(), masterNode);
internalCluster().startMasterOnlyNode();

assertClusterStateSaveOK(savedClusterState.v1(), savedClusterState.v2());

Expand Down