Revert some redundant changes to reduce PR size

Author: David Roberts

server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java

@@ -322,20 +322,12 @@ boolean shouldReassignPersistentTasks(final ClusterChangedEvent event) {
             || event.metaDataChanged()
             || masterChanged) {
 
-            return anyTaskReassignmentRequired(tasks, event.state());
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if any persistent task would change assignment if reassignment were run now.
-     */
-    private boolean anyTaskReassignmentRequired(final PersistentTasksCustomMetaData tasks, final ClusterState state) {
-        for (PersistentTask<?> task : tasks.tasks()) {
-            if (requiresAssignment(task.getAssignment(), state.nodes())) {
-                Assignment assignment = createAssignment(task.getTaskName(), task.getParams(), state);
-                if (Objects.equals(assignment, task.getAssignment()) == false) {
-                    return true;
+            for (PersistentTask<?> task : tasks.tasks()) {
+                if (needsReassignment(task.getAssignment(), event.state().nodes())) {
+                    Assignment assignment = createAssignment(task.getTaskName(), task.getParams(), event.state());
+                    if (Objects.equals(assignment, task.getAssignment()) == false) {
+                        return true;
+                    }
                 }
             }
         }
@@ -365,7 +357,7 @@ ClusterState reassignTasks(final ClusterState currentState) {
 
             // We need to check if removed nodes were running any of the tasks and reassign them
             for (PersistentTask<?> task : tasks.tasks()) {
-                if (requiresAssignment(task.getAssignment(), nodes)) {
+                if (needsReassignment(task.getAssignment(), nodes)) {
                     Assignment assignment = createAssignment(task.getTaskName(), task.getParams(), clusterState);
                     if (Objects.equals(assignment, task.getAssignment()) == false) {
                         logger.trace("reassigning task {} from node {} to node {}", task.getId(),
@@ -389,7 +381,7 @@ static boolean persistentTasksChanged(final ClusterChangedEvent event) {
     }
 
     /** Returns true if the task is not assigned or is assigned to a non-existing node */
-    public static boolean requiresAssignment(final Assignment assignment, final DiscoveryNodes nodes) {
+    public static boolean needsReassignment(final Assignment assignment, final DiscoveryNodes nodes) {
         return (assignment.isAssigned() == false || nodes.nodeExists(assignment.getExecutorNode()) == false);
     }
 

server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java

@@ -59,7 +59,7 @@
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singleton;
-import static org.elasticsearch.persistent.PersistentTasksClusterService.requiresAssignment;
+import static org.elasticsearch.persistent.PersistentTasksClusterService.needsReassignment;
 import static org.elasticsearch.persistent.PersistentTasksClusterService.persistentTasksChanged;
 import static org.elasticsearch.persistent.PersistentTasksExecutor.NO_NODE_FOUND;
 import static org.elasticsearch.test.ClusterServiceUtils.createClusterService;
@@ -409,9 +409,9 @@ public void testNeedsReassignment() {
             .add(new DiscoveryNode("_node_2", buildNewFakeTransportAddress(), Version.CURRENT))
             .build();
 
-        assertTrue(requiresAssignment(new Assignment(null, "unassigned"), nodes));
-        assertTrue(requiresAssignment(new Assignment("_node_left", "assigned to a node that left"), nodes));
-        assertFalse(requiresAssignment(new Assignment("_node_1", "assigned"), nodes));
+        assertTrue(needsReassignment(new Assignment(null, "unassigned"), nodes));
+        assertTrue(needsReassignment(new Assignment("_node_left", "assigned to a node that left"), nodes));
+        assertFalse(needsReassignment(new Assignment("_node_1", "assigned"), nodes));
     }
 
     public void testPeriodicRecheck() throws Exception {

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java

@@ -50,7 +50,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.persistent.PersistentTasksClusterService.requiresAssignment;
+import static org.elasticsearch.persistent.PersistentTasksClusterService.needsReassignment;
 import static org.hamcrest.Matchers.hasEntry;
 
 public class BasicDistributedJobsIT extends BaseMlIntegTestCase {
@@ -395,7 +395,7 @@ private void assertJobTask(String jobId, JobState expectedState, boolean hasExec
 
         if (hasExecutorNode) {
             assertNotNull(task.getExecutorNode());
-            assertFalse(requiresAssignment(task.getAssignment(), clusterState.nodes()));
+            assertFalse(needsReassignment(task.getAssignment(), clusterState.nodes()));
             DiscoveryNode node = clusterState.nodes().resolveNode(task.getExecutorNode());
             assertThat(node.getAttributes(), hasEntry(MachineLearning.ML_ENABLED_NODE_ATTR, "true"));
             assertThat(node.getAttributes(), hasEntry(MachineLearning.MAX_OPEN_JOBS_NODE_ATTR, "20"));

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java

@@ -42,7 +42,7 @@
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.persistent.PersistentTasksClusterService.requiresAssignment;
+import static org.elasticsearch.persistent.PersistentTasksClusterService.needsReassignment;
 
 public class MlDistributedFailureIT extends BaseMlIntegTestCase {
 
@@ -212,7 +212,7 @@ private void run(String jobId, CheckedRunnable<Exception> disrupt) throws Except
             assertNotNull(tasks);
             assertEquals("Expected 2 tasks, but got [" + tasks.taskMap() + "]", 2, tasks.taskMap().size());
             for (PersistentTask<?> task : tasks.tasks()) {
-                assertFalse(requiresAssignment(task.getAssignment(), clusterState.nodes()));
+                assertFalse(needsReassignment(task.getAssignment(), clusterState.nodes()));
             }
 
             GetJobsStatsAction.Request jobStatsRequest = new GetJobsStatsAction.Request(jobId);