Skip to content

Commit

Permalink
Replace master with cluster_manager in test method names in server/sr…
Browse files Browse the repository at this point in the history
…c/internalClusterTest

Signed-off-by: Tianli Feng <ftianli@amazon.com>
  • Loading branch information
Tianli Feng committed May 18, 2022
1 parent 6b4773f commit 02af408
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ private void ensureNoMaster(String node) throws Exception {
/**
* Verify that nodes fault detection detects a disconnected node after cluster-manager reelection
*/
public void testFollowerCheckerDetectsDisconnectedNodeAfterMasterReelection() throws Exception {
testFollowerCheckerAfterMasterReelection(NetworkDisruption.DISCONNECT, Settings.EMPTY);
public void testFollowerCheckerDetectsDisconnectedNodeAfterClusterManagerReelection() throws Exception {
testFollowerCheckerAfterClusterManagerReelection(NetworkDisruption.DISCONNECT, Settings.EMPTY);
}

/**
* Verify that nodes fault detection detects an unresponsive node after cluster-manager reelection
*/
public void testFollowerCheckerDetectsUnresponsiveNodeAfterMasterReelection() throws Exception {
testFollowerCheckerAfterMasterReelection(
public void testFollowerCheckerDetectsUnresponsiveNodeAfterClusterManagerReelection() throws Exception {
testFollowerCheckerAfterClusterManagerReelection(
NetworkDisruption.UNRESPONSIVE,
Settings.builder()
.put(LeaderChecker.LEADER_CHECK_TIMEOUT_SETTING.getKey(), "1s")
Expand All @@ -156,7 +156,7 @@ public void testFollowerCheckerDetectsUnresponsiveNodeAfterMasterReelection() th
);
}

private void testFollowerCheckerAfterMasterReelection(NetworkLinkDisruptionType networkLinkDisruptionType, Settings settings)
private void testFollowerCheckerAfterClusterManagerReelection(NetworkLinkDisruptionType networkLinkDisruptionType, Settings settings)
throws Exception {
internalCluster().startNodes(4, settings);
ensureStableCluster(4);
Expand Down Expand Up @@ -194,7 +194,7 @@ private void testFollowerCheckerAfterMasterReelection(NetworkLinkDisruptionType
* Tests that emulates a frozen elected cluster-manager node that unfreezes and pushes its cluster state to other nodes that already are
* following another elected cluster-manager node. These nodes should reject this cluster state and prevent them from following the stale cluster-manager.
*/
public void testStaleMasterNotHijackingMajority() throws Exception {
public void testStaleClusterManagerNotHijackingMajority() throws Exception {
final List<String> nodes = internalCluster().startNodes(
3,
Settings.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void testRecoverAfterNodes() throws Exception {
assertThat(waitForNoBlocksOnNode(BLOCK_WAIT_TIMEOUT, clientNode3).isEmpty(), equalTo(true));
}

public void testRecoverAfterMasterNodes() throws Exception {
public void testRecoverAfterClusterManagerNodes() throws Exception {
internalCluster().setBootstrapClusterManagerNodeIndex(0);
logger.info("--> start cluster_manager_node (1)");
Client clusterManager1 = startNode(Settings.builder().put("gateway.recover_after_master_nodes", 2).put(clusterManagerOnlyNode()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void run() {
}
}

public void testPreflightCheckAvoidsMaster() throws InterruptedException {
public void testPreflightCheckAvoidsClusterManager() throws InterruptedException {
createIndex("index", Settings.builder().put(INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), 2).build());
ensureGreen("index");
client().prepareIndex("index").setId("1").setSource("field1", "value1").get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ public void testDoNotInfinitelyWaitForMapping() {
}

/** Makes sure the new cluster-manager does not repeatedly fetch index metadata from recovering replicas */
public void testOngoingRecoveryAndMasterFailOver() throws Exception {
public void testOngoingRecoveryAndClusterManagerFailOver() throws Exception {
String indexName = "test";
internalCluster().startNodes(2);
String nodeWithPrimary = internalCluster().startDataOnlyNode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void testFailPipelineCreation() throws Exception {
}
}

public void testFailPipelineCreationProcessorNotInstalledOnMasterNode() throws Exception {
public void testFailPipelineCreationProcessorNotInstalledOnClusterManagerNode() throws Exception {
internalCluster().startNode();
installPlugin = true;
internalCluster().startNode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ public void testQueuedDeletesWithOverlap() throws Exception {
assertThat(client().admin().cluster().prepareGetSnapshots(repoName).get().getSnapshots(), empty());
}

public void testQueuedOperationsOnMasterRestart() throws Exception {
public void testQueuedOperationsOnClusterManagerRestart() throws Exception {
internalCluster().startMasterOnlyNodes(3);
internalCluster().startDataOnlyNode();
final String repoName = "test-repo";
Expand All @@ -649,7 +649,7 @@ public void testQueuedOperationsOnMasterRestart() throws Exception {
awaitNoMoreRunningOperations();
}

public void testQueuedOperationsOnMasterDisconnect() throws Exception {
public void testQueuedOperationsOnClusterManagerDisconnect() throws Exception {
internalCluster().startMasterOnlyNodes(3);
final String dataNode = internalCluster().startDataOnlyNode();
final String repoName = "test-repo";
Expand Down Expand Up @@ -694,7 +694,7 @@ public void testQueuedOperationsOnMasterDisconnect() throws Exception {
awaitNoMoreRunningOperations();
}

public void testQueuedOperationsOnMasterDisconnectAndRepoFailure() throws Exception {
public void testQueuedOperationsOnClusterManagerDisconnectAndRepoFailure() throws Exception {
internalCluster().startMasterOnlyNodes(3);
final String dataNode = internalCluster().startDataOnlyNode();
final String repoName = "test-repo";
Expand Down Expand Up @@ -737,7 +737,7 @@ public void testQueuedOperationsOnMasterDisconnectAndRepoFailure() throws Except
awaitNoMoreRunningOperations();
}

public void testQueuedOperationsAndBrokenRepoOnMasterFailOver() throws Exception {
public void testQueuedOperationsAndBrokenRepoOnClusterManagerFailOver() throws Exception {
disableRepoConsistencyCheck("This test corrupts the repository on purpose");

internalCluster().startMasterOnlyNodes(3);
Expand Down Expand Up @@ -766,7 +766,7 @@ public void testQueuedOperationsAndBrokenRepoOnMasterFailOver() throws Exception
expectThrows(RepositoryException.class, deleteFuture::actionGet);
}

public void testQueuedSnapshotOperationsAndBrokenRepoOnMasterFailOver() throws Exception {
public void testQueuedSnapshotOperationsAndBrokenRepoOnClusterManagerFailOver() throws Exception {
disableRepoConsistencyCheck("This test corrupts the repository on purpose");

internalCluster().startMasterOnlyNodes(3);
Expand Down Expand Up @@ -794,7 +794,7 @@ public void testQueuedSnapshotOperationsAndBrokenRepoOnMasterFailOver() throws E
expectThrows(OpenSearchException.class, snapshotFour::actionGet);
}

public void testQueuedSnapshotOperationsAndBrokenRepoOnMasterFailOver2() throws Exception {
public void testQueuedSnapshotOperationsAndBrokenRepoOnClusterManagerFailOver2() throws Exception {
disableRepoConsistencyCheck("This test corrupts the repository on purpose");

internalCluster().startMasterOnlyNodes(3);
Expand Down Expand Up @@ -827,7 +827,7 @@ public void testQueuedSnapshotOperationsAndBrokenRepoOnMasterFailOver2() throws
expectThrows(OpenSearchException.class, snapshotFour::actionGet);
}

public void testQueuedSnapshotOperationsAndBrokenRepoOnMasterFailOverMultipleRepos() throws Exception {
public void testQueuedSnapshotOperationsAndBrokenRepoOnClusterManagerFailOverMultipleRepos() throws Exception {
disableRepoConsistencyCheck("This test corrupts the repository on purpose");

internalCluster().startMasterOnlyNodes(3, LARGE_SNAPSHOT_POOL_SETTINGS);
Expand Down

0 comments on commit 02af408

Please sign in to comment.