summaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/main/java/com/yahoo/config/provision
diff options
context:
space:
mode:
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java1
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java11
2 files changed, 12 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index eb462c86f4f..c3b2bd9f69a 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -7,6 +7,7 @@ import com.yahoo.config.provisioning.FlavorsConfig;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index 0548bc7520f..4454517d5ec 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -280,6 +280,17 @@ public class NodeResources {
public boolean isUnspecified() { return this.equals(unspecified); }
+ // Returns squared euclidean distance of the relevant numerical values of two node resources
+ public double distanceTo(NodeResources other) {
+ if ( ! this.diskSpeed().compatibleWith(other.diskSpeed())) return Double.MAX_VALUE;
+ if ( ! this.storageType().compatibleWith(other.storageType())) return Double.MAX_VALUE;
+
+ double distance = Math.pow(this.vcpu() - other.vcpu(), 2) + Math.pow(this.memoryGb() - other.memoryGb(), 2);
+ if (this.storageType() == StorageType.local || other.storageType() == StorageType.local)
+ distance += Math.pow(this.diskGb() - other.diskGb(), 2);
+ return distance;
+ }
+
/** Returns this.isUnspecified() ? Optional.empty() : Optional.of(this) */
public Optional<NodeResources> asOptional() {
return this.isUnspecified() ? Optional.empty() : Optional.of(this);