honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 05:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure correct no-master block applied on restart (#54800)

Browse Source 
This commit addresses a long-standing `// TODO` in the coordinator tests to
ensure that the correct no-master block is applied when a node restarts while
disconnected from the cluster.

It also strengthens this test to check that the no-master block is applied
correctly on all nodes, not just the previous master.
This commit is contained in:
David Turner 2020-04-06 13:25:22 +01:00
parent ed4ef78330
commit 2b8a91b7be
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java
View File

@ -921,13 +921,23 @@ public class CoordinatorTests extends AbstractCoordinatorTestCase {
}, (source, e) -> {});
cluster.runFor(DEFAULT_CLUSTER_STATE_UPDATE_DELAY, "committing setting update");
leader.disconnect();
cluster.runFor(defaultMillis(FOLLOWER_CHECK_TIMEOUT_SETTING) + defaultMillis(FOLLOWER_CHECK_INTERVAL_SETTING)
final ClusterNode removedNode = cluster.getAnyNode();
removedNode.disconnect();
cluster.runFor(
Math.max(defaultMillis(FOLLOWER_CHECK_TIMEOUT_SETTING) + defaultMillis(FOLLOWER_CHECK_INTERVAL_SETTING),
defaultMillis(LEADER_CHECK_TIMEOUT_SETTING) + defaultMillis(LEADER_CHECK_INTERVAL_SETTING))
+ DEFAULT_CLUSTER_STATE_UPDATE_DELAY, "detecting disconnection");
assertThat(leader.getLastAppliedClusterState().blocks().global(), hasItem(expectedBlock));
assertThat(removedNode.getLastAppliedClusterState().blocks().global(), hasItem(expectedBlock));
// TODO reboot the leader and verify that the same block is applied when it restarts
removedNode.close();
final ClusterNode restartedNode = removedNode.restartedNode();
cluster.clusterNodes.replaceAll(cn -> cn == removedNode ? restartedNode : cn);
restartedNode.disconnect();
cluster.stabilise();
assertThat(restartedNode.getLastAppliedClusterState().blocks().global(), hasItem(expectedBlock));
}
}