resolveNodes -> resolveVotingTombstones

Author: Andrey Ershov

server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingTombstonesRequest.java

@@ -70,7 +70,7 @@ public AddVotingTombstonesRequest(StreamInput in) throws IOException {
         timeout = in.readTimeValue();
     }
 
-    Set<VotingTombstone> resolveNodes(ClusterState currentState) {
+    Set<VotingTombstone> resolveVotingTombstones(ClusterState currentState) {
         final DiscoveryNodes allNodes = currentState.nodes();
         final Set<VotingTombstone> resolvedNodes = Arrays.stream(allNodes.resolveNodes(nodeDescriptions))
                 .map(allNodes::get).filter(DiscoveryNode::isMasterNode).map(VotingTombstone::new).collect(Collectors.toSet());
@@ -84,8 +84,8 @@ Set<VotingTombstone> resolveNodes(ClusterState currentState) {
         return resolvedNodes;
     }
 
-    Set<VotingTombstone> resolveNodesAndCheckMaximum(ClusterState currentState, int maxTombstoneCount, String maximumSettingKey) {
-        final Set<VotingTombstone> resolvedNodes = resolveNodes(currentState);
+    Set<VotingTombstone> resolveVotingTombstones(ClusterState currentState, int maxTombstoneCount, String maximumSettingKey) {
+        final Set<VotingTombstone> resolvedNodes = resolveVotingTombstones(currentState);
 
         final int oldTombstoneCount = currentState.getVotingTombstones().size();
         final int newTombstoneCount = resolvedNodes.size();

server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingTombstonesAction.java

@@ -80,7 +80,7 @@ protected AddVotingTombstonesResponse read(StreamInput in) throws IOException {
     protected void masterOperation(AddVotingTombstonesRequest request, ClusterState state,
                                    ActionListener<AddVotingTombstonesResponse> listener) throws Exception {
 
-        resolveNodesAndCheckMaximum(request, state); // throws IllegalArgumentException if no nodes matched or maximum exceeded
+        resolveVotingTombstonesAndCheckMaximum(request, state); // throws IllegalArgumentException if no nodes matched or maximum exceeded
 
         clusterService.submitStateUpdateTask("add-voting-tombstones", new ClusterStateUpdateTask(Priority.URGENT) {
 
@@ -89,7 +89,7 @@ protected void masterOperation(AddVotingTombstonesRequest request, ClusterState
             @Override
             public ClusterState execute(ClusterState currentState) {
                 assert resolvedNodes == null : resolvedNodes;
-                resolvedNodes = resolveNodesAndCheckMaximum(request, currentState);
+                resolvedNodes = resolveVotingTombstonesAndCheckMaximum(request, currentState);
 
                 final CoordinationMetaData.Builder builder = CoordinationMetaData.builder(currentState.coordinationMetaData());
                 resolvedNodes.forEach(builder::addVotingTombstone);
@@ -145,8 +145,8 @@ public void onTimeout(TimeValue timeout) {
         });
     }
 
-    private static Set<VotingTombstone> resolveNodesAndCheckMaximum(AddVotingTombstonesRequest request, ClusterState state) {
-        return request.resolveNodesAndCheckMaximum(state,
+    private static Set<VotingTombstone> resolveVotingTombstonesAndCheckMaximum(AddVotingTombstonesRequest request, ClusterState state) {
+        return request.resolveVotingTombstones(state,
             MAXIMUM_VOTING_TOMBSTONES_SETTING.get(state.metaData().settings()), MAXIMUM_VOTING_TOMBSTONES_SETTING.getKey());
     }
 

server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingTombstonesRequestTests.java

@@ -69,16 +69,16 @@ public void testResolve() {
         final ClusterState clusterState = ClusterState.builder(new ClusterName("cluster")).nodes(new Builder()
             .add(localNode).add(otherNode1).add(otherNode2).add(otherDataNode).localNodeId(localNode.getId())).build();
 
-        assertThat(makeRequest().resolveNodes(clusterState),
+        assertThat(makeRequest().resolveVotingTombstones(clusterState),
                 containsInAnyOrder(localNodeTombstone, otherNode1Tombstone, otherNode2Tombstone));
-        assertThat(makeRequest("_all").resolveNodes(clusterState),
+        assertThat(makeRequest("_all").resolveVotingTombstones(clusterState),
                 containsInAnyOrder(localNodeTombstone, otherNode1Tombstone, otherNode2Tombstone));
-        assertThat(makeRequest("_local").resolveNodes(clusterState),
+        assertThat(makeRequest("_local").resolveVotingTombstones(clusterState),
                 contains(localNodeTombstone));
-        assertThat(makeRequest("other*").resolveNodes(clusterState),
+        assertThat(makeRequest("other*").resolveVotingTombstones(clusterState),
                 containsInAnyOrder(otherNode1Tombstone, otherNode2Tombstone));
 
-        assertThat(expectThrows(IllegalArgumentException.class, () -> makeRequest("not-a-node").resolveNodes(clusterState)).getMessage(),
+        assertThat(expectThrows(IllegalArgumentException.class, () -> makeRequest("not-a-node").resolveVotingTombstones(clusterState)).getMessage(),
             equalTo("add voting tombstones request for [not-a-node] matched no master-eligible nodes"));
     }
 
@@ -99,17 +99,17 @@ public void testResolveAndCheckMaximum() {
                 .coordinationMetaData(CoordinationMetaData.builder().addVotingTombstone(otherNode1Tombstone).build()));
         final ClusterState clusterState = builder.build();
 
-        assertThat(makeRequest().resolveNodesAndCheckMaximum(clusterState, 3, "setting.name"),
+        assertThat(makeRequest().resolveVotingTombstones(clusterState, 3, "setting.name"),
                 containsInAnyOrder(localNodeTombstone, otherNode2Tombstone));
-        assertThat(makeRequest("_local").resolveNodesAndCheckMaximum(clusterState, 2, "setting.name"),
+        assertThat(makeRequest("_local").resolveVotingTombstones(clusterState, 2, "setting.name"),
                 contains(localNodeTombstone));
 
         assertThat(expectThrows(IllegalArgumentException.class,
-            () -> makeRequest().resolveNodesAndCheckMaximum(clusterState, 2, "setting.name")).getMessage(),
+            () -> makeRequest().resolveVotingTombstones(clusterState, 2, "setting.name")).getMessage(),
             equalTo("add voting tombstones request for [] would add [2] voting tombstones to the existing [1] which would exceed the " +
                 "maximum of [2] set by [setting.name]"));
         assertThat(expectThrows(IllegalArgumentException.class,
-            () -> makeRequest("_local").resolveNodesAndCheckMaximum(clusterState, 1, "setting.name")).getMessage(),
+            () -> makeRequest("_local").resolveVotingTombstones(clusterState, 1, "setting.name")).getMessage(),
             equalTo("add voting tombstones request for [_local] would add [1] voting tombstones to the existing [1] which would exceed " +
                 "the maximum of [1] set by [setting.name]"));
     }