diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-15 10:00:19 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-15 10:00:19 +0100 |
commit | 6400454d02a93876dc6e7aa4e1b4ef25d8422938 (patch) | |
tree | 5c31088a8dc2b8ba280e79bb2982b2d70d2814da /config-model/src/main/java/com/yahoo/config/model | |
parent | a2f7d4a67d84d1fe2ebc633ca727409d56d81e0c (diff) |
- Rewrite tests to avoid depending on a empty content cluster not requiring a docproc cluster.
- Empty content cluster serves no purpose.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index c8f088509c5..befe57a97e4 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -13,7 +13,6 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeResources; -import com.yahoo.config.provision.NodeResources.DiskSpeed; import com.yahoo.config.provision.ProvisionLogger; import java.util.ArrayList; @@ -310,9 +309,7 @@ public class InMemoryProvisioner implements HostProvisioner { if (a.memoryGb() < b.memoryGb()) return -1; if (a.diskGb() > b.diskGb()) return 1; if (a.diskGb() < b.diskGb()) return -1; - if (a.vcpu() > b.vcpu()) return 1; - if (a.vcpu() < b.vcpu()) return -1; - return 0; + return Double.compare(a.vcpu(), b.vcpu()); } } |