Skip to content

Commit 47bb535

Browse files
authored
[Test] Wait for expected master on all nodes (#131399)
This PR changes the test to simply wait expected master on every node instead of selectively waiting on one non-master and one master node. The later is problematic since it uses API that is not suitable when the cluster is changing master. Relates: #127213
1 parent 6dd4d67 commit 47bb535

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,30 @@ public void testElectOnlyBetweenMasterNodes() throws Exception {
6060

6161
logger.info("--> start master node (1)");
6262
final String masterNodeName = internalCluster().startMasterOnlyNode();
63-
awaitMasterNode(internalCluster().getNonMasterNodeName(), masterNodeName);
64-
awaitMasterNode(internalCluster().getMasterName(), masterNodeName);
63+
for (var nodeName : internalCluster().getNodeNames()) {
64+
awaitMasterNode(nodeName, masterNodeName);
65+
}
6566

6667
logger.info("--> start master node (2)");
6768
final String nextMasterEligableNodeName = internalCluster().startMasterOnlyNode();
68-
awaitMasterNode(internalCluster().getNonMasterNodeName(), masterNodeName);
69-
awaitMasterNode(internalCluster().getMasterName(), masterNodeName);
69+
for (var nodeName : internalCluster().getNodeNames()) {
70+
awaitMasterNode(nodeName, masterNodeName);
71+
}
7072

7173
logger.info("--> closing master node (1)");
7274
client().execute(
7375
TransportAddVotingConfigExclusionsAction.TYPE,
7476
new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, masterNodeName)
7577
).get();
7678
// removing the master from the voting configuration immediately triggers the master to step down
77-
awaitMasterNode(internalCluster().getNonMasterNodeName(), nextMasterEligableNodeName);
78-
awaitMasterNode(internalCluster().getMasterName(), nextMasterEligableNodeName);
79+
for (var nodeName : internalCluster().getNodeNames()) {
80+
awaitMasterNode(nodeName, nextMasterEligableNodeName);
81+
}
7982

8083
internalCluster().stopNode(masterNodeName);
81-
awaitMasterNode(internalCluster().getNonMasterNodeName(), nextMasterEligableNodeName);
82-
awaitMasterNode(internalCluster().getMasterName(), nextMasterEligableNodeName);
84+
for (var nodeName : internalCluster().getNodeNames()) {
85+
awaitMasterNode(nodeName, nextMasterEligableNodeName);
86+
}
8387
}
8488

8589
public void testAliasFilterValidation() {

0 commit comments

Comments
 (0)