diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java index 5f86111d352a9..5d5f2082fb71f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java @@ -60,13 +60,15 @@ public void testElectOnlyBetweenMasterNodes() throws Exception { logger.info("--> start master node (1)"); final String masterNodeName = internalCluster().startMasterOnlyNode(); - awaitMasterNode(internalCluster().getNonMasterNodeName(), masterNodeName); - awaitMasterNode(internalCluster().getMasterName(), masterNodeName); + for (var nodeName : internalCluster().getNodeNames()) { + awaitMasterNode(nodeName, masterNodeName); + } logger.info("--> start master node (2)"); final String nextMasterEligableNodeName = internalCluster().startMasterOnlyNode(); - awaitMasterNode(internalCluster().getNonMasterNodeName(), masterNodeName); - awaitMasterNode(internalCluster().getMasterName(), masterNodeName); + for (var nodeName : internalCluster().getNodeNames()) { + awaitMasterNode(nodeName, masterNodeName); + } logger.info("--> closing master node (1)"); client().execute( @@ -74,12 +76,14 @@ public void testElectOnlyBetweenMasterNodes() throws Exception { new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, masterNodeName) ).get(); // removing the master from the voting configuration immediately triggers the master to step down - awaitMasterNode(internalCluster().getNonMasterNodeName(), nextMasterEligableNodeName); - awaitMasterNode(internalCluster().getMasterName(), nextMasterEligableNodeName); + for (var nodeName : internalCluster().getNodeNames()) { + awaitMasterNode(nodeName, nextMasterEligableNodeName); + } internalCluster().stopNode(masterNodeName); - awaitMasterNode(internalCluster().getNonMasterNodeName(), nextMasterEligableNodeName); - awaitMasterNode(internalCluster().getMasterName(), nextMasterEligableNodeName); + for (var nodeName : internalCluster().getNodeNames()) { + awaitMasterNode(nodeName, nextMasterEligableNodeName); + } } public void testAliasFilterValidation() {