From c175e07c8a0b5101a47ba9bef6a4dcb60d4564c5 Mon Sep 17 00:00:00 2001 From: javanna Date: Wed, 30 Mar 2016 15:09:41 +0200 Subject: [PATCH] Remove DiscoveryNodes#nodes in favour of existing DiscoveryNodes#getNodes --- .../action/support/nodes/TransportNodesAction.java | 2 +- .../action/support/tasks/TransportTasksAction.java | 2 +- .../elasticsearch/cluster/node/DiscoveryNodes.java | 13 ++----------- .../elasticsearch/discovery/zen/ZenDiscovery.java | 2 +- .../support/nodes/TransportNodesActionTests.java | 2 +- .../elasticsearch/cluster/ClusterStateDiffIT.java | 12 ++++++------ .../elasticsearch/cluster/SimpleClusterStateIT.java | 4 ++-- .../cluster/action/shard/ShardStateActionTests.java | 2 +- .../cluster/node/DiscoveryNodesTests.java | 6 +++--- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java b/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java index a6a646ec251..6f236db1d7d 100644 --- a/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java @@ -127,7 +127,7 @@ public abstract class TransportNodesAction nodes = clusterState.nodes().nodes(); + ImmutableOpenMap nodes = clusterState.nodes().getNodes(); this.nodes = new DiscoveryNode[nodesIds.length]; for (int i = 0; i < nodesIds.length; i++) { this.nodes[i] = nodes.get(nodesIds[i]); diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java index 68c286a943d..b1bdb5b2b84 100644 --- a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java @@ -205,7 +205,7 @@ public abstract class TransportTasksAction< ClusterState clusterState = clusterService.state(); String[] nodesIds = resolveNodes(request, clusterState); this.nodesIds = filterNodeIds(clusterState.nodes(), nodesIds); - ImmutableOpenMap nodes = clusterState.nodes().nodes(); + ImmutableOpenMap nodes = clusterState.nodes().getNodes(); this.nodes = new DiscoveryNode[nodesIds.length]; for (int i = 0; i < this.nodesIds.length; i++) { this.nodes[i] = nodes.get(this.nodesIds[i]); diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java index bbd5f5b724d..9f7bc4c2a06 100644 --- a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java +++ b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java @@ -105,22 +105,13 @@ public class DiscoveryNodes extends AbstractDiffable implements return nodes.size(); } - /** - * Get a {@link Map} of the discovered nodes arranged by their ids - * - * @return {@link Map} of the discovered nodes arranged by their ids - */ - public ImmutableOpenMap nodes() { - return this.nodes; - } - /** * Get a {@link Map} of the discovered nodes arranged by their ids * * @return {@link Map} of the discovered nodes arranged by their ids */ public ImmutableOpenMap getNodes() { - return nodes(); + return this.nodes; } /** @@ -632,7 +623,7 @@ public class DiscoveryNodes extends AbstractDiffable implements public Builder(DiscoveryNodes nodes) { this.masterNodeId = nodes.masterNodeId(); this.localNodeId = nodes.localNodeId(); - this.nodes = ImmutableOpenMap.builder(nodes.nodes()); + this.nodes = ImmutableOpenMap.builder(nodes.getNodes()); } public Builder put(DiscoveryNode node) { diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index b83e8e4aa72..a4c06536fa9 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -252,7 +252,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implemen } } else { // we're master -> let other potential master we left and start a master election now rather then wait for masterFD - DiscoveryNode[] possibleMasters = electMaster.nextPossibleMasters(nodes.nodes().values(), 5); + DiscoveryNode[] possibleMasters = electMaster.nextPossibleMasters(nodes.getNodes().values(), 5); for (DiscoveryNode possibleMaster : possibleMasters) { if (nodes.localNode().equals(possibleMaster)) { continue; diff --git a/core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java b/core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java index d5c8283b8b1..ad2326c3148 100644 --- a/core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java @@ -80,7 +80,7 @@ public class TransportNodesActionTests extends ESTestCase { nodeSelectors.add(randomFrom(NodeSelector.values()).selector); } int numNodeIds = randomIntBetween(0, 3); - String[] nodeIds = clusterService.state().nodes().nodes().keys().toArray(String.class); + String[] nodeIds = clusterService.state().nodes().getNodes().keys().toArray(String.class); for (int i = 0; i < numNodeIds; i++) { String nodeId = randomFrom(nodeIds); nodeSelectors.add(nodeId); diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java index 00b8291957c..0490864dbc2 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java @@ -133,10 +133,10 @@ public class ClusterStateDiffIT extends ESIntegTestCase { assertThat(clusterStateFromDiffs.stateUUID(), equalTo(clusterState.stateUUID())); // Check nodes - assertThat(clusterStateFromDiffs.nodes().nodes(), equalTo(clusterState.nodes().nodes())); + assertThat(clusterStateFromDiffs.nodes().getNodes(), equalTo(clusterState.nodes().getNodes())); assertThat(clusterStateFromDiffs.nodes().localNodeId(), equalTo(previousClusterStateFromDiffs.nodes().localNodeId())); - assertThat(clusterStateFromDiffs.nodes().nodes(), equalTo(clusterState.nodes().nodes())); - for (ObjectCursor node : clusterStateFromDiffs.nodes().nodes().keys()) { + assertThat(clusterStateFromDiffs.nodes().getNodes(), equalTo(clusterState.nodes().getNodes())); + for (ObjectCursor node : clusterStateFromDiffs.nodes().getNodes().keys()) { DiscoveryNode node1 = clusterState.nodes().get(node.value); DiscoveryNode node2 = clusterStateFromDiffs.nodes().get(node.value); assertThat(node1.getVersion(), equalTo(node2.getVersion())); @@ -184,7 +184,7 @@ public class ClusterStateDiffIT extends ESIntegTestCase { */ private ClusterState.Builder randomNodes(ClusterState clusterState) { DiscoveryNodes.Builder nodes = DiscoveryNodes.builder(clusterState.nodes()); - List nodeIds = randomSubsetOf(randomInt(clusterState.nodes().nodes().size() - 1), clusterState.nodes().nodes().keys().toArray(String.class)); + List nodeIds = randomSubsetOf(randomInt(clusterState.nodes().getNodes().size() - 1), clusterState.nodes().getNodes().keys().toArray(String.class)); for (String nodeId : nodeIds) { if (nodeId.startsWith("node-")) { if (randomBoolean()) { @@ -215,13 +215,13 @@ public class ClusterStateDiffIT extends ESIntegTestCase { if (randomBoolean()) { builder.remove(index); } else { - builder.add(randomChangeToIndexRoutingTable(clusterState.routingTable().indicesRouting().get(index), clusterState.nodes().nodes().keys().toArray(String.class))); + builder.add(randomChangeToIndexRoutingTable(clusterState.routingTable().indicesRouting().get(index), clusterState.nodes().getNodes().keys().toArray(String.class))); } } } int additionalIndexCount = randomIntBetween(1, 20); for (int i = 0; i < additionalIndexCount; i++) { - builder.add(randomIndexRoutingTable("index-" + randomInt(), clusterState.nodes().nodes().keys().toArray(String.class))); + builder.add(randomIndexRoutingTable("index-" + randomInt(), clusterState.nodes().getNodes().keys().toArray(String.class))); } return ClusterState.builder(clusterState).routingTable(builder.build()); } diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java index da5f3149d6c..2de99d6296c 100644 --- a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java @@ -72,10 +72,10 @@ public class SimpleClusterStateIT extends ESIntegTestCase { public void testNodes() throws Exception { ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().clear().setNodes(true).get(); - assertThat(clusterStateResponse.getState().nodes().nodes().size(), is(cluster().size())); + assertThat(clusterStateResponse.getState().nodes().getNodes().size(), is(cluster().size())); ClusterStateResponse clusterStateResponseFiltered = client().admin().cluster().prepareState().clear().get(); - assertThat(clusterStateResponseFiltered.getState().nodes().nodes().size(), is(0)); + assertThat(clusterStateResponseFiltered.getState().nodes().getNodes().size(), is(0)); } public void testMetadata() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java index 561b51de1e9..a4afd30f788 100644 --- a/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java @@ -333,7 +333,7 @@ public class ShardStateActionTests extends ESTestCase { ShardRouting failedShard = getRandomShardRouting(index); - String nodeId = randomFrom(clusterService.state().nodes().nodes().keys().toArray(String.class)); + String nodeId = randomFrom(clusterService.state().nodes().getNodes().keys().toArray(String.class)); AtomicReference failure = new AtomicReference<>(); CountDownLatch latch = new CountDownLatch(1); diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java index fe80baebd52..a282fcaa3a6 100644 --- a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java @@ -39,7 +39,7 @@ public class DiscoveryNodesTests extends ESTestCase { public void testResolveNodeByIdOrName() { DiscoveryNodes discoveryNodes = buildDiscoveryNodes(); - DiscoveryNode[] nodes = discoveryNodes.nodes().values().toArray(DiscoveryNode.class); + DiscoveryNode[] nodes = discoveryNodes.getNodes().values().toArray(DiscoveryNode.class); DiscoveryNode node = randomFrom(nodes); DiscoveryNode resolvedNode = discoveryNodes.resolveNode(randomBoolean() ? node.getId() : node.getName()); assertThat(resolvedNode.getId(), equalTo(node.getId())); @@ -77,14 +77,14 @@ public class DiscoveryNodesTests extends ESTestCase { } } int numNodeIds = randomIntBetween(0, 3); - String[] nodeIds = discoveryNodes.nodes().keys().toArray(String.class); + String[] nodeIds = discoveryNodes.getNodes().keys().toArray(String.class); for (int i = 0; i < numNodeIds; i++) { String nodeId = randomFrom(nodeIds); nodeSelectors.add(nodeId); expectedNodeIdsSet.add(nodeId); } int numNodeNames = randomIntBetween(0, 3); - DiscoveryNode[] nodes = discoveryNodes.nodes().values().toArray(DiscoveryNode.class); + DiscoveryNode[] nodes = discoveryNodes.getNodes().values().toArray(DiscoveryNode.class); for (int i = 0; i < numNodeNames; i++) { DiscoveryNode discoveryNode = randomFrom(nodes); nodeSelectors.add(discoveryNode.getName());