diff options
| author | toby <smorgrav@yahoo-inc.com> | 2017-07-20 12:13:01 +0200 |
|---|---|---|
| committer | toby <smorgrav@yahoo-inc.com> | 2017-08-14 11:27:08 +0200 |
| commit | 88cce873834794c810d1768901bb122ba6c0fb92 (patch) | |
| tree | 8ca354a49abad7de755c7689d6541a95eae6db94 /node-repository/src | |
| parent | 571cece4fd144723513946898333419d5f825a91 (diff) | |
Fix compare bug on flavor cost
Diffstat (limited to 'node-repository/src')
2 files changed, 2 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index 331fe6f403d..b2cd1fa613a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -81,7 +81,6 @@ public class NodePrioritizer { } private void addSurplusNodes(List<Node> surplusNodes) { - //TODO change group index if content for (Node node : surplusNodes) { nodes.put(node, toNodePriority(node, true, false)); } @@ -221,7 +220,6 @@ public class NodePrioritizer { List<NodePriority> prioritizedNodes = nodes.values().stream().collect(Collectors.toList()); Collections.sort(prioritizedNodes, (a,b) -> NodePriority.compare(a,b)); - List<Node> result = new ArrayList<>(); for (NodePriority nodePriority : prioritizedNodes) { // The replacement heuristic assumes that new nodes are offered after already existing nodes diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePriority.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePriority.java index b41082bd34d..d4e5402064f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePriority.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePriority.java @@ -84,8 +84,8 @@ public class NodePriority { if (freeCapacity != 0) return freeCapacity; // Choose cheapest node - if (n1.node.flavor().cost() < n1.node.flavor().cost()) return -1; - if (n2.node.flavor().cost() < n2.node.flavor().cost()) return 1; + if (n1.node.flavor().cost() < n2.node.flavor().cost()) return -1; + if (n2.node.flavor().cost() < n1.node.flavor().cost()) return 1; // All else equal choose hostname lexically return n1.node.hostname().compareTo(n2.node.hostname()); |