honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove minNodeVersion and corresponding public `getSmallestVersion` getter method from DiscoveryNodes

This commit is contained in:
javanna 2016-11-19 15:22:21 +01:00 committed by Luca Cavanna
parent 366241508e
commit b19c606cef
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,19 +56,17 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
private final String masterNodeId; private final String masterNodeId;
private final String localNodeId; private final String localNodeId;
private final Version minNodeVersion;
private final Version minNonClientNodeVersion; private final Version minNonClientNodeVersion;
private DiscoveryNodes(ImmutableOpenMap<String, DiscoveryNode> nodes, ImmutableOpenMap<String, DiscoveryNode> dataNodes, private DiscoveryNodes(ImmutableOpenMap<String, DiscoveryNode> nodes, ImmutableOpenMap<String, DiscoveryNode> dataNodes,
ImmutableOpenMap<String, DiscoveryNode> masterNodes, ImmutableOpenMap<String, DiscoveryNode> ingestNodes, ImmutableOpenMap<String, DiscoveryNode> masterNodes, ImmutableOpenMap<String, DiscoveryNode> ingestNodes,
String masterNodeId, String localNodeId, Version minNodeVersion, Version minNonClientNodeVersion) { String masterNodeId, String localNodeId, Version minNonClientNodeVersion) {
this.nodes = nodes; this.nodes = nodes;
this.dataNodes = dataNodes; this.dataNodes = dataNodes;
this.masterNodes = masterNodes; this.masterNodes = masterNodes;
this.ingestNodes = ingestNodes; this.ingestNodes = ingestNodes;
this.masterNodeId = masterNodeId; this.masterNodeId = masterNodeId;
this.localNodeId = localNodeId; this.localNodeId = localNodeId;
this.minNodeVersion = minNodeVersion;
this.minNonClientNodeVersion = minNonClientNodeVersion; this.minNonClientNodeVersion = minNonClientNodeVersion;
} }
@ -173,7 +171,6 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
return existing != null && existing.equals(node); return existing != null && existing.equals(node);
} }
/** /**
* Get the id of the master node * Get the id of the master node
* *
@ -230,16 +227,6 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
return nodesIds == null || nodesIds.length == 0 || (nodesIds.length == 1 && nodesIds[0].equals("_all")); return nodesIds == null || nodesIds.length == 0 || (nodesIds.length == 1 && nodesIds[0].equals("_all"));
} }
/**
* Returns the version of the node with the oldest version in the cluster
*
* @return the oldest version in the cluster
*/
public Version getSmallestVersion() {
return minNodeVersion;
}
/** /**
* Returns the version of the node with the oldest version in the cluster that is not a client node * Returns the version of the node with the oldest version in the cluster that is not a client node
* *
@ -677,7 +664,7 @@ public class DiscoveryNodes extends AbstractDiffable<DiscoveryNodes> implements
return new DiscoveryNodes( return new DiscoveryNodes(
nodes.build(), dataNodesBuilder.build(), masterNodesBuilder.build(), ingestNodesBuilder.build(), nodes.build(), dataNodesBuilder.build(), masterNodesBuilder.build(), ingestNodesBuilder.build(),
masterNodeId, localNodeId, minNodeVersion, minNonClientNodeVersion masterNodeId, localNodeId, minNonClientNodeVersion
); );
} }