Skip to content

Wait for state publication in SLMFileSettingsIT.testSettingsApplied #130869

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 3 commits into from
Jul 14, 2025
Merged

Wait for state publication in SLMFileSettingsIT.testSettingsApplied #130869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a18a6b
Wait for state publication in `SLMFileSettingsIT.testSettingsApplied`
nielsbauman Jul 8, 2025
95186a1
Merge branch 'main' into fix-130853
nielsbauman Jul 14, 2025
e5a605d
Remove redundant `awaitMasterNode`
nielsbauman Jul 14, 2025
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 @@ -502,9 +502,6 @@ tests:
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
issue: https://github.com/elastic/elasticsearch/issues/122414
- class: org.elasticsearch.xpack.slm.SLMFileSettingsIT
method: testSettingsApplied
issue: https://github.com/elastic/elasticsearch/issues/130853
- class: org.elasticsearch.cluster.ClusterStateSerializationTests
method: testSerializationPreMultiProject
issue: https://github.com/elastic/elasticsearch/issues/130872
Expand Down
4 changes: 2 additions & 2 deletions ...lugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,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())
).get();
Expand Down Expand Up @@ -229,8 +230,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