diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-04-28 12:18:26 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-04-28 12:18:26 +0200 |
commit | 69b9f7a2f3aa59f329bcb67db04e3c4235c39038 (patch) | |
tree | 3b28d0f27ccefeb8eed67e0af446b5400545e761 /config-provisioning | |
parent | 7f3e2de5f92a892dedcd423726af6064ff7af4ab (diff) |
Rescale exhaustively when window moves outside current deployment
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java index 11ae0845fb0..9aaf0d365cd 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java @@ -37,6 +37,8 @@ public class ClusterResources { public boolean smallerThan(ClusterResources other) { if (this.nodes < other.nodes) return true; if (this.groups < other.groups) return true; + if (this.nodeResources.isUnspecified() || other.nodeResources.isUnspecified()) return false; + if ( ! this.nodeResources.justNumbers().satisfies(other.nodeResources.justNumbers())) return true; return false; } 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 05b604b263f..bed36d0d5d2 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 @@ -241,6 +241,8 @@ public class NodeResources { return true; } + public boolean isUnspecified() { return this == unspecified; } + /** * Create this from serial form. * |