resolveVotingTombstonesAndCheckMaximum

Author: Andrey Ershov

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

@@ -84,7 +84,7 @@ Set<VotingTombstone> resolveVotingTombstones(ClusterState currentState) {
         return resolvedNodes;
     }
 
-    Set<VotingTombstone> resolveVotingTombstones(ClusterState currentState, int maxTombstoneCount, String maximumSettingKey) {
+    Set<VotingTombstone> resolveVotingTombstonesAndCheckMaximum(ClusterState currentState, int maxTombstoneCount, String maximumSettingKey) {
         final Set<VotingTombstone> resolvedNodes = resolveVotingTombstones(currentState);
 
         final int oldTombstoneCount = currentState.getVotingTombstones().size();

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

@@ -146,7 +146,7 @@ public void onTimeout(TimeValue timeout) {
     }
 
     private static Set<VotingTombstone> resolveVotingTombstonesAndCheckMaximum(AddVotingTombstonesRequest request, ClusterState state) {
-        return request.resolveVotingTombstones(state,
+        return request.resolveVotingTombstonesAndCheckMaximum(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

@@ -99,17 +99,17 @@ public void testResolveAndCheckMaximum() {
                 .coordinationMetaData(CoordinationMetaData.builder().addVotingTombstone(otherNode1Tombstone).build()));
         final ClusterState clusterState = builder.build();
 
-        assertThat(makeRequest().resolveVotingTombstones(clusterState, 3, "setting.name"),
+        assertThat(makeRequest().resolveVotingTombstonesAndCheckMaximum(clusterState, 3, "setting.name"),
                 containsInAnyOrder(localNodeTombstone, otherNode2Tombstone));
-        assertThat(makeRequest("_local").resolveVotingTombstones(clusterState, 2, "setting.name"),
+        assertThat(makeRequest("_local").resolveVotingTombstonesAndCheckMaximum(clusterState, 2, "setting.name"),
                 contains(localNodeTombstone));
 
         assertThat(expectThrows(IllegalArgumentException.class,
-            () -> makeRequest().resolveVotingTombstones(clusterState, 2, "setting.name")).getMessage(),
+            () -> makeRequest().resolveVotingTombstonesAndCheckMaximum(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").resolveVotingTombstones(clusterState, 1, "setting.name")).getMessage(),
+            () -> makeRequest("_local").resolveVotingTombstonesAndCheckMaximum(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]"));
     }