Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace internal usages of 'master' term in 'server/src/test' directory #2520

Merged
merged 26 commits into from
May 25, 2022
Merged

Replace internal usages of 'master' term in 'server/src/test' directory #2520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6b0ce71
Replace internal usages of 'master' terminology in server/src/test di…
Mar 19, 2022
36ebbcb
Merge branch 'main' into replace-master-int-server-test
Mar 19, 2022
63e5728
Merge branch 'main' into replace-master-int-server-test
Apr 27, 2022
47c5c0b
Merge remote-tracking branch 'upstream/main' into replace-master-int-…
May 4, 2022
a130464
Replace 'master' terminology with 'cluster manager' more classes
May 4, 2022
3747411
Replace 'master' terminology with 'cluster manager' more classes
May 4, 2022
33ebf86
Adjust format by spotlessApply task
May 4, 2022
9751c84
Replace 'master' terminology with 'cluster manager' more classes
May 4, 2022
8db5521
Replace 'master' terminology with 'cluster manager' more classes
May 4, 2022
d6dda60
Adjust format by spotlessApply task
May 5, 2022
b4953ad
Merge remote-tracking branch 'upstream/main' into replace-master-int-…
May 15, 2022
44c6122
Replace 'master' terminology with 'cluster manager' in server/src/tes…
May 15, 2022
bddb976
Replace master with cluster_manager in node filter
May 16, 2022
4f8cf38
Adjust format by spotlessApply task
May 16, 2022
a01fd4e
Rename assertDifferentMaster()
May 17, 2022
6b756ec
Replace master with cluster_manager in server/src/test
May 18, 2022
fa6e5ed
Merge remote-tracking branch 'upstream/main' into replace-master-int-…
May 18, 2022
47cfbab
Adjust format by spotlessApply task
May 18, 2022
dbb085b
Replace master with cluster_manager in assertNoMaster() in server/src…
May 18, 2022
4f71700
Resolve compile error
May 18, 2022
50fcf3b
Merge branch 'main' into replace-master-int-server-test
May 19, 2022
737843f
Replace master with cluster_manager in test method names in server/sr…
May 19, 2022
a87cede
Rename master to cluster-manager in sever/src/test
May 24, 2022
37a0b17
Replace master with cluster_manager in test method names in server/sr…
May 25, 2022
51d5007
Merge branch 'main' into replace-master-int-server-test
May 25, 2022
704f00c
Replace NoMasterBlock with NoClusterManagerBlock in test method names…
May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust format by spotlessApply task 
Signed-off-by: Tianli Feng <ftianli@amazon.com>
  • Loading branch information
Tianli Feng committed May 16, 2022
commit 4f8cf38dc451a4f8326b15093d12ed6875ab5f28
6 changes: 5 additions & 1 deletion ...src/test/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,11 @@ public void testDescriptionAfterBootstrapping() {
)
);

final DiscoveryNode otherClusterManagerNode = new DiscoveryNode("other-cluster-manager", buildNewFakeTransportAddress(), Version.CURRENT);
final DiscoveryNode otherClusterManagerNode = new DiscoveryNode(
"other-cluster-manager",
buildNewFakeTransportAddress(),
Version.CURRENT
);
final DiscoveryNode otherNonClusterManagerNode = new DiscoveryNode(
"other-non-cluster-manager",
buildNewFakeTransportAddress(),
Expand Down
20 changes: 10 additions & 10 deletions server/src/test/java/org/opensearch/cluster/node/DiscoveryNodesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,20 +311,20 @@ public void testDeprecatedMasterNodeFilter() {
final DiscoveryNodes discoveryNodes = buildDiscoveryNodes();

final String[] allNodes = StreamSupport.stream(discoveryNodes.spliterator(), false)
.map(DiscoveryNode::getId)
.toArray(String[]::new);
.map(DiscoveryNode::getId)
.toArray(String[]::new);

final String[] clusterManagerNodes = StreamSupport.stream(discoveryNodes.getNodes().values().spliterator(), false)
.map(n -> n.value)
.filter(n -> n.isMasterNode() == true)
.map(DiscoveryNode::getId)
.toArray(String[]::new);
.map(n -> n.value)
.filter(n -> n.isMasterNode() == true)
.map(DiscoveryNode::getId)
.toArray(String[]::new);

final String[] nonClusterManagerNodes = StreamSupport.stream(discoveryNodes.getNodes().values().spliterator(), false)
.map(n -> n.value)
.filter(n -> n.isMasterNode() == false)
.map(DiscoveryNode::getId)
.toArray(String[]::new);
.map(n -> n.value)
.filter(n -> n.isMasterNode() == false)
.map(DiscoveryNode::getId)
.toArray(String[]::new);

assertThat(discoveryNodes.resolveNodes("cluster_manager:true"), arrayContainingInAnyOrder(clusterManagerNodes));
assertThat(discoveryNodes.resolveNodes("master:true"), arrayContainingInAnyOrder(clusterManagerNodes));
Expand Down