[Test] Wait for clsuter to form before assertions #130973
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; | ||
| import org.elasticsearch.client.internal.Client; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.metadata.ProjectId; | ||
| import org.elasticsearch.cluster.metadata.RepositoryMetadata; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
|
|
@@ -96,24 +97,21 @@ public void testPreferFullMasterOverVotingOnlyNodes() throws Exception { | |
| internalCluster().setBootstrapMasterNodeIndex(0); | ||
| internalCluster().startNodes(2); | ||
| internalCluster().startNode(addRoles(Set.of(DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE))); | ||
| final int numDataNodes = randomInt(2); | ||
| internalCluster().startDataOnlyNodes(numDataNodes); | ||
| internalCluster().validateClusterFormed(); | ||
|
|
||
| awaitClusterState( | ||
| state -> state.getLastCommittedConfiguration().getNodeIds().size() == 3 && state.nodes().size() == 3 + numDataNodes | ||
| ); | ||
| final String originalMaster = internalCluster().getMasterName(); | ||
|
|
||
| internalCluster().stopCurrentMasterNode(); | ||
| internalCluster().validateClusterFormed(); | ||
| assertNotEquals(originalMaster, internalCluster().getMasterName()); | ||
| final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(); | ||
| assertThat(state.nodes().size(), equalTo(2 + numDataNodes)); | ||
|
||
| assertThat(VotingOnlyNodePlugin.isVotingOnlyNode(state.nodes().getMasterNode()), equalTo(false)); | ||
| } | ||
|
|
||
| public void testBootstrapOnlyVotingOnlyNodes() throws Exception { | ||
|
|
@@ -157,21 +155,21 @@ public void testVotingOnlyNodesCannotBeMasterWithoutFullMasterNodes() throws Exc | |
| internalCluster().setBootstrapMasterNodeIndex(0); | ||
| internalCluster().startNode(); | ||
| internalCluster().startNodes(2, addRoles(Set.of(DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE))); | ||
| final int numDataNodes = randomInt(2); | ||
| internalCluster().startDataOnlyNodes(numDataNodes); | ||
| internalCluster().validateClusterFormed(); | ||
|
|
||
| awaitClusterState( | ||
| state -> state.getLastCommittedConfiguration().getNodeIds().size() == 3 && state.nodes().size() == 3 + numDataNodes | ||
| ); | ||
| final String oldMasterId = internalCluster().getMasterName(); | ||
|
|
||
| internalCluster().stopCurrentMasterNode(); | ||
| awaitMasterNotFound(); | ||
|
|
||
| // start a fresh full master node, which will be brought into the cluster as master by the voting-only nodes | ||
| final String newMaster = internalCluster().startNode(); | ||
| internalCluster().validateClusterFormed(); | ||
|
||
| assertEquals(newMaster, internalCluster().getMasterName()); | ||
| final String newMasterId = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNodeId(); | ||
| assertNotEquals(oldMasterId, newMasterId); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather this remained as just an
awaitMasterNode(). That should be sufficient here...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is theoretically possible that the data node fails to join the new master so that
awaitMasterNode()returns without seeing the data node. If we later ask the data node (via a randomed client) about its master and it could fail with NPE. That said, it is not a practical concern for this test. So I reverted back to useawaitMasterNode.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, that shouldn't be possible (i.e. I'd want the test to fail if that happens). The new master will start from the state that the old master last committed, which will include the data node, so the data node will automatically be part of the new master's cluster. The new master would only remove the data node from its cluster if something positively fails (e.g. network disconnect).