Choose cheaper nodes with less skew regardless of parent host state

1 files changed, 5 insertions, 5 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java
index 1f45e466c9d..46932eb1468 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java
@@ -79,11 +79,6 @@ class PrioritizableNode implements Comparable<PrioritizableNode> {
         if (this.node.state() != other.node.state())
             throw new IllegalStateException("Nodes " + this.node + " and " + other.node + " have different states");
 
-        // Choose nodes where host is in more desirable state
-        int thisHostStatePri = this.parent.map(host -> ALLOCATABLE_HOST_STATES.indexOf(host.state())).orElse(-2);
-        int otherHostStatePri = other.parent.map(host -> ALLOCATABLE_HOST_STATES.indexOf(host.state())).orElse(-2);
-        if (thisHostStatePri != otherHostStatePri) return otherHostStatePri - thisHostStatePri;
-
         if (this.parent.isPresent() && other.parent.isPresent()) {
             int diskCostDifference = NodeResources.DiskSpeed.compare(this.parent.get().flavor().resources().diskSpeed(),
                                                                      other.parent.get().flavor().resources().diskSpeed());
@@ -104,6 +99,11 @@ class PrioritizableNode implements Comparable<PrioritizableNode> {
         if (this.node.flavor().cost() < other.node.flavor().cost()) return -1;
         if (other.node.flavor().cost() < this.node.flavor().cost()) return 1;
 
+        // Choose nodes where host is in more desirable state
+        int thisHostStatePri = this.parent.map(host -> ALLOCATABLE_HOST_STATES.indexOf(host.state())).orElse(-2);
+        int otherHostStatePri = other.parent.map(host -> ALLOCATABLE_HOST_STATES.indexOf(host.state())).orElse(-2);
+        if (thisHostStatePri != otherHostStatePri) return otherHostStatePri - thisHostStatePri;
+
         // All else equal choose hostname alphabetically
         return this.node.hostname().compareTo(other.node.hostname());
     }