From 0ae3ba898745ef51dd425beec1538d945ba62332 Mon Sep 17 00:00:00 2001 From: Artem Prigoda Date: Fri, 4 Feb 2022 17:49:44 +0100 Subject: [PATCH] Remove DiscoveryNodes#getAllNodes Since DiscoverNodes now extends `AbstractCollection` we don't need a method exposing DiscoveryNodes as a `Collection` and we can call `stream` directly on `DiscoveryNodes` See #83453 --- .../cluster/node/DiscoveryNodes.java | 9 ---- .../PersistentTasksClusterService.java | 1 - .../search/TransportSearchActionTests.java | 4 +- .../PersistentTasksClusterServiceTests.java | 6 +-- ...ardFollowTasksExecutorAssignmentTests.java | 2 +- .../action/InternalExecutePolicyAction.java | 3 +- .../TransportGetDeploymentStatsAction.java | 1 - ...portStartTrainedModelDeploymentAction.java | 1 - .../TrainedModelAllocationClusterService.java | 3 +- .../task/OpenJobPersistentTasksExecutor.java | 2 +- ...ortStartDataFrameAnalyticsActionTests.java | 10 ++-- .../xpack/ml/job/JobNodeSelectorTests.java | 44 ++++++++-------- .../OpenJobPersistentTasksExecutorTests.java | 14 ++--- ...TransformPersistentTasksExecutorTests.java | 52 ++++--------------- 14 files changed, 48 insertions(+), 104 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java index 64734f936fe68..5aea48ce88fa1 100644 --- a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java +++ b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.AbstractCollection; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -166,14 +165,6 @@ public ImmutableOpenMap getCoordinatingOnlyNodes() { return nodes.build(); } - /** - * Return all the nodes as a collection - * @return - */ - public Collection getAllNodes() { - return this; - } - /** * Returns a stream of all nodes, with master nodes at the front */ diff --git a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java index d321bb14bafe8..e9e90b752cbe3 100644 --- a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java +++ b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java @@ -336,7 +336,6 @@ private Assignment createAssignment( // want to assign a persistent task to a node that will shortly be // leaving the cluster final List candidateNodes = currentState.nodes() - .getAllNodes() .stream() .filter(dn -> isNodeShuttingDown(currentState, dn.getId()) == false) .collect(Collectors.toList()); diff --git a/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java index db749b02ad8c0..b441c54d1233d 100644 --- a/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java @@ -1289,7 +1289,7 @@ public void testLocalShardIteratorFromPointInTime() { } else { // relocated or no longer assigned relocatedContexts.add(new ShardId(indexMetadata.getIndex(), shardId)); - targetNode = randomFrom(clusterState.nodes().getAllNodes()).getId(); + targetNode = randomFrom(clusterState.nodes()).getId(); } contexts.put( new ShardId(indexMetadata.getIndex(), shardId), @@ -1343,7 +1343,7 @@ public void testLocalShardIteratorFromPointInTime() { anotherShardId, new SearchContextIdForNode( null, - randomFrom(clusterState.nodes().getAllNodes()).getId(), + randomFrom(clusterState.nodes()).getId(), new ShardSearchContextId(UUIDs.randomBase64UUID(), randomNonNegativeLong(), null) ) ); diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java index e70618bfd5e88..b9968ef7be0d3 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java @@ -627,7 +627,7 @@ public void testTasksNotAssignedToShuttingDownNodes() { // Now that we have a bunch of tasks that need to be assigned, let's // mark half the nodes as shut down and make sure they do not have any // tasks assigned - Collection allNodes = clusterState.nodes().getAllNodes(); + Collection allNodes = clusterState.nodes(); Map shutdownMetadataMap = new HashMap<>(); allNodes.stream() .limit(Math.floorDiv(allNodes.size(), 2)) @@ -816,10 +816,6 @@ private Assignment randomNodeAssignment(Collection nodes) { return Optional.ofNullable(randomFrom(nodes)).map(node -> new Assignment(node.getId(), "test assignment")).orElse(NO_NODE_FOUND); } - private Assignment randomNodeAssignment(DiscoveryNodes nodes) { - return randomNodeAssignment(nodes.getAllNodes()); - } - private String dumpEvent(ClusterChangedEvent event) { return "nodes_changed: " + event.nodesChanged() diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutorAssignmentTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutorAssignmentTests.java index d35d2eaf4fb6d..0398f99db7ca0 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutorAssignmentTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutorAssignmentTests.java @@ -92,7 +92,7 @@ private void runAssignmentTest( clusterStateBuilder.nodes(nodesBuilder); final Assignment assignment = executor.getAssignment( mock(ShardFollowTask.class), - clusterStateBuilder.nodes().getAllNodes(), + clusterStateBuilder.nodes(), clusterStateBuilder.build() ); consumer.accept(theSpecial, assignment); diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/InternalExecutePolicyAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/InternalExecutePolicyAction.java index 2298e861341a7..480acc185f016 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/InternalExecutePolicyAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/InternalExecutePolicyAction.java @@ -160,8 +160,7 @@ DiscoveryNode selectNodeForPolicyExecution(DiscoveryNodes discoNodes) { return discoNodes.getLocalNode(); } - final var nodes = discoNodes.getAllNodes() - .stream() + final var nodes = discoNodes.stream() // filter out elected master node (which is the local node) .filter(discoNode -> discoNode.getId().equals(discoNodes.getMasterNodeId()) == false) // filter out dedicated master nodes diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDeploymentStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDeploymentStatsAction.java index a4170cf2ad010..e044cdea28013 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDeploymentStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDeploymentStatsAction.java @@ -143,7 +143,6 @@ protected void doExecute( ClusterState latestState = clusterService.state(); Set nodesShuttingDown = TransportStartTrainedModelDeploymentAction.nodesShuttingDown(latestState); List nodes = latestState.getNodes() - .getAllNodes() .stream() .filter(d -> nodesShuttingDown.contains(d.getId()) == false) .filter(StartTrainedModelDeploymentAction.TaskParams::mayAllocateToNode) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java index da3d5a8f8800e..4f615d3b64f89 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java @@ -441,7 +441,6 @@ public boolean test(ClusterState clusterState) { } Set nodesShuttingDown = nodesShuttingDown(clusterState); List nodes = clusterState.nodes() - .getAllNodes() .stream() .filter(d -> nodesShuttingDown.contains(d.getId()) == false) .filter(TaskParams::mayAllocateToNode) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/allocation/TrainedModelAllocationClusterService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/allocation/TrainedModelAllocationClusterService.java index 445487a796368..c2e914ad91c2d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/allocation/TrainedModelAllocationClusterService.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/allocation/TrainedModelAllocationClusterService.java @@ -253,7 +253,7 @@ ClusterState createModelAllocation(ClusterState currentState, StartTrainedModelD Set shuttingDownNodes = nodesShuttingDown(currentState); Map nodeToReason = new TreeMap<>(); - for (DiscoveryNode node : currentState.getNodes().getAllNodes()) { + for (DiscoveryNode node : currentState.getNodes()) { if (StartTrainedModelDeploymentAction.TaskParams.mayAllocateToNode(node) && shuttingDownNodes.contains(node.getId()) == false) { Optional maybeError = nodeHasCapacity(currentState, params, node); if (maybeError.isPresent()) { @@ -357,7 +357,6 @@ ClusterState addRemoveAllocationNodes(ClusterState currentState) { final TrainedModelAllocationMetadata.Builder builder = TrainedModelAllocationMetadata.builder(currentState); Set shuttingDownNodes = nodesShuttingDown(currentState); Map currentEligibleNodes = currentState.getNodes() - .getAllNodes() .stream() // TODO: Change when we update `mayAllocateToNode` .filter( diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java index c3bc216d5d064..4ea52aec6e59e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java @@ -217,7 +217,7 @@ public void validate(OpenJobAction.JobParams params, ClusterState clusterState) validateJobAndId(jobId, job); // If we already know that we can't find an ml node because all ml nodes are running at capacity or // simply because there are no ml nodes in the cluster then we fail quickly here: - PersistentTasksCustomMetadata.Assignment assignment = getAssignment(params, clusterState.nodes().getAllNodes(), clusterState); + PersistentTasksCustomMetadata.Assignment assignment = getAssignment(params, clusterState.nodes(), clusterState); if (assignment.equals(AWAITING_UPGRADE)) { throw makeCurrentlyBeingUpgradedException(logger, params.getJobId()); } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsActionTests.java index 20bdfcd34da2c..a739a712200f0 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsActionTests.java @@ -57,7 +57,7 @@ public void testGetAssignment_UpgradeModeIsEnabled() { .metadata(Metadata.builder().putCustom(MlMetadata.TYPE, new MlMetadata.Builder().isUpgradeMode(true).build())) .build(); - Assignment assignment = executor.getAssignment(params, clusterState.nodes().getAllNodes(), clusterState); + Assignment assignment = executor.getAssignment(params, clusterState.nodes(), clusterState); assertThat(assignment.getExecutorNode(), is(nullValue())); assertThat(assignment.getExplanation(), is(equalTo("persistent task cannot be assigned while upgrade mode is enabled."))); } @@ -70,7 +70,7 @@ public void testGetAssignment_NoNodes() { .metadata(Metadata.builder().putCustom(MlMetadata.TYPE, new MlMetadata.Builder().build())) .build(); - Assignment assignment = executor.getAssignment(params, clusterState.nodes().getAllNodes(), clusterState); + Assignment assignment = executor.getAssignment(params, clusterState.nodes(), clusterState); assertThat(assignment.getExecutorNode(), is(nullValue())); assertThat(assignment.getExplanation(), is(emptyString())); } @@ -89,7 +89,7 @@ public void testGetAssignment_NoMlNodes() { ) .build(); - Assignment assignment = executor.getAssignment(params, clusterState.nodes().getAllNodes(), clusterState); + Assignment assignment = executor.getAssignment(params, clusterState.nodes(), clusterState); assertThat(assignment.getExecutorNode(), is(nullValue())); assertThat( assignment.getExplanation(), @@ -118,7 +118,7 @@ public void testGetAssignment_MlNodesAreTooOld() { ) .build(); - Assignment assignment = executor.getAssignment(params, clusterState.nodes().getAllNodes(), clusterState); + Assignment assignment = executor.getAssignment(params, clusterState.nodes(), clusterState); assertThat(assignment.getExecutorNode(), is(nullValue())); assertThat( assignment.getExplanation(), @@ -153,7 +153,7 @@ public void testGetAssignment_MlNodeIsNewerThanTheMlJobButTheAssignmentSuceeds() .nodes(DiscoveryNodes.builder().add(createNode(0, true, Version.V_7_10_0))) .build(); - Assignment assignment = executor.getAssignment(params, clusterState.nodes().getAllNodes(), clusterState); + Assignment assignment = executor.getAssignment(params, clusterState.nodes(), clusterState); assertThat(assignment.getExecutorNode(), is(equalTo("_node_id0"))); assertThat(assignment.getExplanation(), is(emptyString())); } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobNodeSelectorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobNodeSelectorTests.java index 38fd059691334..88ed7780d3cc4 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobNodeSelectorTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobNodeSelectorTests.java @@ -118,7 +118,7 @@ public void testSelectLeastLoadedMlNodeForAnomalyDetectorJob_maxCapacityCountLim JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -159,7 +159,7 @@ public void testSelectLeastLoadedMlNodeForDataFrameAnalyticsJob_maxCapacityCount JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), dataFrameAnalyticsId, MlTasks.DATA_FRAME_ANALYTICS_TASK_NAME, memoryTracker, @@ -206,7 +206,7 @@ public void testSelectLeastLoadedMlNodeForAnomalyDetectorJob_maxCapacityMemoryLi JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -255,7 +255,7 @@ public void testSelectLeastLoadedMlNodeForDataFrameAnalyticsJob_givenTaskHasNull JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), dataFrameAnalyticsId, MlTasks.DATA_FRAME_ANALYTICS_TASK_NAME, memoryTracker, @@ -287,7 +287,7 @@ public void testSelectLeastLoadedMlNodeForAnomalyDetectorJob_firstJobTooBigMemor JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -339,7 +339,7 @@ public void testSelectLeastLoadedMlNodeForDataFrameAnalyticsJob_maxCapacityMemor JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), dataFrameAnalyticsId, MlTasks.DATA_FRAME_ANALYTICS_TASK_NAME, memoryTracker, @@ -390,7 +390,7 @@ public void testSelectLeastLoadedMlNodeForDataFrameAnalyticsJob_firstJobTooBigMe JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), dataFrameAnalyticsId, MlTasks.DATA_FRAME_ANALYTICS_TASK_NAME, memoryTracker, @@ -460,7 +460,7 @@ public void testSelectLeastLoadedMlNode_noMlNodes() { JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -526,7 +526,7 @@ public void testSelectLeastLoadedMlNode_maxConcurrentOpeningJobs() { ClusterState cs = csBuilder.build(); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs, - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job6.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -547,7 +547,7 @@ public void testSelectLeastLoadedMlNode_maxConcurrentOpeningJobs() { Job job7 = BaseMlIntegTestCase.createFareQuoteJob("job_id7", JOB_MEMORY_REQUIREMENT).build(new Date()); jobNodeSelector = new JobNodeSelector( cs, - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job7.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -570,7 +570,7 @@ public void testSelectLeastLoadedMlNode_maxConcurrentOpeningJobs() { cs = csBuilder.build(); jobNodeSelector = new JobNodeSelector( cs, - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job7.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -590,7 +590,7 @@ public void testSelectLeastLoadedMlNode_maxConcurrentOpeningJobs() { cs = csBuilder.build(); jobNodeSelector = new JobNodeSelector( cs, - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job7.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -663,7 +663,7 @@ public void testSelectLeastLoadedMlNode_concurrentOpeningJobsAndStaleFailedJob() // Allocation won't be possible if the stale failed job is treated as opening JobNodeSelector jobNodeSelector = new JobNodeSelector( cs, - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job7.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -683,7 +683,7 @@ public void testSelectLeastLoadedMlNode_concurrentOpeningJobsAndStaleFailedJob() Job job8 = BaseMlIntegTestCase.createFareQuoteJob("job_id8", JOB_MEMORY_REQUIREMENT).build(new Date()); jobNodeSelector = new JobNodeSelector( cs, - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job8.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -738,7 +738,7 @@ public void testSelectLeastLoadedMlNode_noCompatibleJobTypeNodes() { cs.metadata(metadata); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -793,7 +793,7 @@ public void testSelectLeastLoadedMlNode_reasonsAreInDeterministicOrder() { cs.metadata(metadata); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -858,7 +858,7 @@ public void testSelectLeastLoadedMlNode_noNodesMatchingModelSnapshotMinVersion() cs.metadata(metadata); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -908,7 +908,7 @@ public void testSelectLeastLoadedMlNode_jobWithRules() { Job job = jobWithRules("job_with_rules"); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -1001,7 +1001,7 @@ public void testConsiderLazyAssignmentWithNoLazyNodes() { Job job = BaseMlIntegTestCase.createFareQuoteJob("job_id1000", JOB_MEMORY_REQUIREMENT).build(new Date()); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -1045,7 +1045,7 @@ public void testConsiderLazyAssignmentWithLazyNodes() { Job job = BaseMlIntegTestCase.createFareQuoteJob("job_id1000", JOB_MEMORY_REQUIREMENT).build(new Date()); JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -1074,7 +1074,7 @@ public void testMaximumPossibleNodeMemoryTooSmall() { JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, @@ -1164,7 +1164,7 @@ public void testPerceivedCapacityAndMaxFreeMemory() { JobNodeSelector jobNodeSelector = new JobNodeSelector( cs.build(), - shuffled(cs.nodes().getAllNodes()), + shuffled(cs.nodes()), job.getId(), MlTasks.JOB_TASK_NAME, memoryTracker, diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutorTests.java index 16538b2357c7c..d3513e5758c25 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutorTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutorTests.java @@ -167,7 +167,7 @@ public void testGetAssignment_GivenUnavailableIndicesWithLazyNode() { assertEquals( "Not opening [unavailable_index_with_lazy_node], " + "because not all primary shards are active for the following indices [.ml-state]", - executor.getAssignment(params, csBuilder.nodes().getAllNodes(), csBuilder.build()).getExplanation() + executor.getAssignment(params, csBuilder.nodes(), csBuilder.build()).getExplanation() ); } @@ -186,11 +186,7 @@ public void testGetAssignment_GivenLazyJobAndNoGlobalLazyNodes() { when(job.allowLazyOpen()).thenReturn(true); OpenJobAction.JobParams params = new OpenJobAction.JobParams("lazy_job"); params.setJob(job); - PersistentTasksCustomMetadata.Assignment assignment = executor.getAssignment( - params, - csBuilder.nodes().getAllNodes(), - csBuilder.build() - ); + PersistentTasksCustomMetadata.Assignment assignment = executor.getAssignment(params, csBuilder.nodes(), csBuilder.build()); assertNotNull(assignment); assertNull(assignment.getExecutorNode()); assertEquals(JobNodeSelector.AWAITING_LAZY_ASSIGNMENT.getExplanation(), assignment.getExplanation()); @@ -207,11 +203,7 @@ public void testGetAssignment_GivenResetInProgress() { Job job = mock(Job.class); OpenJobAction.JobParams params = new OpenJobAction.JobParams("job_during_reset"); params.setJob(job); - PersistentTasksCustomMetadata.Assignment assignment = executor.getAssignment( - params, - csBuilder.nodes().getAllNodes(), - csBuilder.build() - ); + PersistentTasksCustomMetadata.Assignment assignment = executor.getAssignment(params, csBuilder.nodes(), csBuilder.build()); assertNotNull(assignment); assertNull(assignment.getExecutorNode()); assertEquals(MlTasks.RESET_IN_PROGRESS.getExplanation(), assignment.getExplanation()); diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java index 54b602c0afee3..9190e0151a2b4 100644 --- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java @@ -62,17 +62,15 @@ public void testNodeVersionAssignment() { TransformPersistentTasksExecutor executor = buildTaskExecutor(); assertThat( - executor.getAssignment(new TransformTaskParams("new-task-id", Version.CURRENT, null, true), cs.nodes().getAllNodes(), cs) - .getExecutorNode(), + executor.getAssignment(new TransformTaskParams("new-task-id", Version.CURRENT, null, true), cs.nodes(), cs).getExecutorNode(), equalTo("current-data-node-with-1-tasks") ); assertThat( - executor.getAssignment(new TransformTaskParams("new-task-id", Version.CURRENT, null, false), cs.nodes().getAllNodes(), cs) - .getExecutorNode(), + executor.getAssignment(new TransformTaskParams("new-task-id", Version.CURRENT, null, false), cs.nodes(), cs).getExecutorNode(), equalTo("current-data-node-with-0-tasks-transform-remote-disabled") ); assertThat( - executor.getAssignment(new TransformTaskParams("new-old-task-id", Version.V_7_7_0, null, true), cs.nodes().getAllNodes(), cs) + executor.getAssignment(new TransformTaskParams("new-old-task-id", Version.V_7_7_0, null, true), cs.nodes(), cs) .getExecutorNode(), equalTo("past-data-node-1") ); @@ -86,7 +84,7 @@ public void testNodeAssignmentProblems() { Assignment assignment = executor.getAssignment( new TransformTaskParams("new-task-id", Version.CURRENT, null, false), - cs.nodes().getAllNodes(), + cs.nodes(), cs ); assertNull(assignment.getExecutorNode()); @@ -100,11 +98,7 @@ public void testNodeAssignmentProblems() { cs = buildClusterState(nodes); executor = buildTaskExecutor(); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.CURRENT, null, false), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.CURRENT, null, false), cs.nodes(), cs); assertNotNull(assignment.getExecutorNode()); assertThat(assignment.getExecutorNode(), equalTo("dedicated-transform-node")); @@ -113,11 +107,7 @@ public void testNodeAssignmentProblems() { cs = buildClusterState(nodes); executor = buildTaskExecutor(); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.V_8_0_0, null, false), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_8_0_0, null, false), cs.nodes(), cs); assertNull(assignment.getExecutorNode()); assertThat( assignment.getExplanation(), @@ -130,11 +120,7 @@ public void testNodeAssignmentProblems() { ) ); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.V_7_5_0, null, false), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_7_5_0, null, false), cs.nodes(), cs); assertNotNull(assignment.getExecutorNode()); assertThat(assignment.getExecutorNode(), equalTo("past-data-node-1")); @@ -143,11 +129,7 @@ public void testNodeAssignmentProblems() { cs = buildClusterState(nodes); executor = buildTaskExecutor(); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.V_7_5_0, null, true), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_7_5_0, null, true), cs.nodes(), cs); assertNull(assignment.getExecutorNode()); assertThat( assignment.getExplanation(), @@ -159,11 +141,7 @@ public void testNodeAssignmentProblems() { ) ); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.CURRENT, null, false), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.CURRENT, null, false), cs.nodes(), cs); assertNotNull(assignment.getExecutorNode()); assertThat(assignment.getExecutorNode(), equalTo("current-data-node-with-0-tasks-transform-remote-disabled")); @@ -172,11 +150,7 @@ public void testNodeAssignmentProblems() { cs = buildClusterState(nodes); executor = buildTaskExecutor(); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.V_7_5_0, null, true), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_7_5_0, null, true), cs.nodes(), cs); assertNull(assignment.getExecutorNode()); assertThat( assignment.getExplanation(), @@ -194,11 +168,7 @@ public void testNodeAssignmentProblems() { cs = buildClusterState(nodes); executor = buildTaskExecutor(); - assignment = executor.getAssignment( - new TransformTaskParams("new-task-id", Version.V_7_5_0, null, true), - cs.nodes().getAllNodes(), - cs - ); + assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_7_5_0, null, true), cs.nodes(), cs); assertNotNull(assignment.getExecutorNode()); assertThat(assignment.getExecutorNode(), equalTo("past-data-node-1")); }