From 5a18a6bca3e708252213a8c4f7d09c513a4885ca Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Tue, 8 Jul 2025 19:33:18 -0300 Subject: [PATCH 1/2] Wait for state publication in `SLMFileSettingsIT.testSettingsApplied` Since the cluster state API no longer runs on the master node, we need to wait for the cluster state publication to have finished before retrieving the cluster state. Fixes #130853 --- muted-tests.yml | 3 --- .../java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index a8be4745d0b22..d9226f171cc2b 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -555,9 +555,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 # Examples: # diff --git a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java index 54a390f55cc35..d49770eb12618 100644 --- a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java +++ b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java @@ -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(); From e5a605d7940316bcb72584c59d76002172d932b0 Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Mon, 14 Jul 2025 15:15:13 -0300 Subject: [PATCH 2/2] Remove redundant `awaitMasterNode` --- .../java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java index d49770eb12618..1bc0d56ad3626 100644 --- a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java +++ b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java @@ -230,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());