honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove DiscoveryNodes#nodes in favour of existing DiscoveryNodes#getNodes

Browse Source
This commit is contained in:
javanna 2016-03-30 15:09:41 +02:00 committed by Luca Cavanna
parent fc2e6d7ce0
commit c175e07c8a
9 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
View File

@ -127,7 +127,7 @@ public abstract class TransportNodesAction<NodesRequest extends BaseNodesRequest
ClusterState clusterState = clusterService.state(); ClusterState clusterState = clusterService.state();
String[] nodesIds = resolveNodes(request, clusterState); String[] nodesIds = resolveNodes(request, clusterState);
this.nodesIds = filterNodeIds(clusterState.nodes(), nodesIds); this.nodesIds = filterNodeIds(clusterState.nodes(), nodesIds);
ImmutableOpenMap<String, DiscoveryNode> nodes = clusterState.nodes().nodes(); ImmutableOpenMap<String, DiscoveryNode> nodes = clusterState.nodes().getNodes();
this.nodes = new DiscoveryNode[nodesIds.length]; this.nodes = new DiscoveryNode[nodesIds.length];
for (int i = 0; i < nodesIds.length; i++) { for (int i = 0; i < nodesIds.length; i++) {
this.nodes[i] = nodes.get(nodesIds[i]); this.nodes[i] = nodes.get(nodesIds[i]);

2
core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java
View File

@ -205,7 +205,7 @@ public abstract class TransportTasksAction<
ClusterState clusterState = clusterService.state(); ClusterState clusterState = clusterService.state();
String[] nodesIds = resolveNodes(request, clusterState); String[] nodesIds = resolveNodes(request, clusterState);
this.nodesIds = filterNodeIds(clusterState.nodes(), nodesIds); this.nodesIds = filterNodeIds(clusterState.nodes(), nodesIds);
ImmutableOpenMap<String, DiscoveryNode> nodes = clusterState.nodes().nodes(); ImmutableOpenMap<String, DiscoveryNode> nodes = clusterState.nodes().getNodes();
this.nodes = new DiscoveryNode[nodesIds.length]; this.nodes = new DiscoveryNode[nodesIds.length];
for (int i = 0; i < this.nodesIds.length; i++) { for (int i = 0; i < this.nodesIds.length; i++) {
this.nodes[i] = nodes.get(this.nodesIds[i]); this.nodes[i] = nodes.get(this.nodesIds[i]);

13
core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
View File

@ -105,22 +105,13 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
return nodes.size(); 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<String, DiscoveryNode> nodes() {
return this.nodes;
}
/** /**
* Get a {@link Map} of the discovered nodes arranged by their ids * Get a {@link Map} of the discovered nodes arranged by their ids
* *
* @return {@link Map} of the discovered nodes arranged by their ids * @return {@link Map} of the discovered nodes arranged by their ids
*/ */
public ImmutableOpenMap<String, DiscoveryNode> getNodes() { public ImmutableOpenMap<String, DiscoveryNode> getNodes() {
return nodes(); return this.nodes;
} }
/** /**
@ -632,7 +623,7 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
public Builder(DiscoveryNodes nodes) { public Builder(DiscoveryNodes nodes) {
this.masterNodeId = nodes.masterNodeId(); this.masterNodeId = nodes.masterNodeId();
this.localNodeId = nodes.localNodeId(); this.localNodeId = nodes.localNodeId();
this.nodes = ImmutableOpenMap.builder(nodes.nodes()); this.nodes = ImmutableOpenMap.builder(nodes.getNodes());
} }
public Builder put(DiscoveryNode node) { public Builder put(DiscoveryNode node) {

2
core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
View File

@ -252,7 +252,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
} }
} else { } else {
// we're master -> let other potential master we left and start a master election now rather then wait for masterFD // 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) { for (DiscoveryNode possibleMaster : possibleMasters) {
if (nodes.localNode().equals(possibleMaster)) { if (nodes.localNode().equals(possibleMaster)) {
continue; continue;

2
core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java
View File

@ -80,7 +80,7 @@ public class TransportNodesActionTests extends ESTestCase {
nodeSelectors.add(randomFrom(NodeSelector.values()).selector); nodeSelectors.add(randomFrom(NodeSelector.values()).selector);
} }
int numNodeIds = randomIntBetween(0, 3); 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++) { for (int i = 0; i < numNodeIds; i++) {
String nodeId = randomFrom(nodeIds); String nodeId = randomFrom(nodeIds);
nodeSelectors.add(nodeId); nodeSelectors.add(nodeId);

12
core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
View File

@ -133,10 +133,10 @@ public class ClusterStateDiffIT extends ESIntegTestCase {
assertThat(clusterStateFromDiffs.stateUUID(), equalTo(clusterState.stateUUID())); assertThat(clusterStateFromDiffs.stateUUID(), equalTo(clusterState.stateUUID()));
// Check nodes // 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().localNodeId(), equalTo(previousClusterStateFromDiffs.nodes().localNodeId()));
assertThat(clusterStateFromDiffs.nodes().nodes(), equalTo(clusterState.nodes().nodes())); assertThat(clusterStateFromDiffs.nodes().getNodes(), equalTo(clusterState.nodes().getNodes()));
for (ObjectCursor<String> node : clusterStateFromDiffs.nodes().nodes().keys()) { for (ObjectCursor<String> node : clusterStateFromDiffs.nodes().getNodes().keys()) {
DiscoveryNode node1 = clusterState.nodes().get(node.value); DiscoveryNode node1 = clusterState.nodes().get(node.value);
DiscoveryNode node2 = clusterStateFromDiffs.nodes().get(node.value); DiscoveryNode node2 = clusterStateFromDiffs.nodes().get(node.value);
assertThat(node1.getVersion(), equalTo(node2.getVersion())); assertThat(node1.getVersion(), equalTo(node2.getVersion()));
@ -184,7 +184,7 @@ public class ClusterStateDiffIT extends ESIntegTestCase {
*/ */
private ClusterState.Builder randomNodes(ClusterState clusterState) { private ClusterState.Builder randomNodes(ClusterState clusterState) {
DiscoveryNodes.Builder nodes = DiscoveryNodes.builder(clusterState.nodes()); DiscoveryNodes.Builder nodes = DiscoveryNodes.builder(clusterState.nodes());
List<String> nodeIds = randomSubsetOf(randomInt(clusterState.nodes().nodes().size() - 1), clusterState.nodes().nodes().keys().toArray(String.class)); List<String> nodeIds = randomSubsetOf(randomInt(clusterState.nodes().getNodes().size() - 1), clusterState.nodes().getNodes().keys().toArray(String.class));
for (String nodeId : nodeIds) { for (String nodeId : nodeIds) {
if (nodeId.startsWith("node-")) { if (nodeId.startsWith("node-")) {
if (randomBoolean()) { if (randomBoolean()) {
@ -215,13 +215,13 @@ public class ClusterStateDiffIT extends ESIntegTestCase {
if (randomBoolean()) { if (randomBoolean()) {
builder.remove(index); builder.remove(index);
} else { } 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); int additionalIndexCount = randomIntBetween(1, 20);
for (int i = 0; i < additionalIndexCount; i++) { 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()); return ClusterState.builder(clusterState).routingTable(builder.build());
} }

4
core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
View File

@ -72,10 +72,10 @@ public class SimpleClusterStateIT extends ESIntegTestCase {
public void testNodes() throws Exception { public void testNodes() throws Exception {
ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().clear().setNodes(true).get(); 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(); 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 { public void testMetadata() throws Exception {

2
core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java
View File

@ -333,7 +333,7 @@ public class ShardStateActionTests extends ESTestCase {
ShardRouting failedShard = getRandomShardRouting(index); 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<Throwable> failure = new AtomicReference<>(); AtomicReference<Throwable> failure = new AtomicReference<>();
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);

6
core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java
View File

@ -39,7 +39,7 @@ public class DiscoveryNodesTests extends ESTestCase {
public void testResolveNodeByIdOrName() { public void testResolveNodeByIdOrName() {
DiscoveryNodes discoveryNodes = buildDiscoveryNodes(); DiscoveryNodes discoveryNodes = buildDiscoveryNodes();
DiscoveryNode[] nodes = discoveryNodes.nodes().values().toArray(DiscoveryNode.class); DiscoveryNode[] nodes = discoveryNodes.getNodes().values().toArray(DiscoveryNode.class);
DiscoveryNode node = randomFrom(nodes); DiscoveryNode node = randomFrom(nodes);
DiscoveryNode resolvedNode = discoveryNodes.resolveNode(randomBoolean() ? node.getId() : node.getName()); DiscoveryNode resolvedNode = discoveryNodes.resolveNode(randomBoolean() ? node.getId() : node.getName());
assertThat(resolvedNode.getId(), equalTo(node.getId())); assertThat(resolvedNode.getId(), equalTo(node.getId()));
@ -77,14 +77,14 @@ public class DiscoveryNodesTests extends ESTestCase {
} }
} }
int numNodeIds = randomIntBetween(0, 3); 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++) { for (int i = 0; i < numNodeIds; i++) {
String nodeId = randomFrom(nodeIds); String nodeId = randomFrom(nodeIds);
nodeSelectors.add(nodeId); nodeSelectors.add(nodeId);
expectedNodeIdsSet.add(nodeId); expectedNodeIdsSet.add(nodeId);
} }
int numNodeNames = randomIntBetween(0, 3); 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++) { for (int i = 0; i < numNodeNames; i++) {
DiscoveryNode discoveryNode = randomFrom(nodes); DiscoveryNode discoveryNode = randomFrom(nodes);
nodeSelectors.add(discoveryNode.getName()); nodeSelectors.add(discoveryNode.getName());