Now we can adjust for redundancy when preserving

1 files changed, 6 insertions, 13 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java
index 8d2f98187b3..7bc019caabb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceTarget.java
@@ -16,38 +16,31 @@ import java.util.OptionalDouble;
  */
 public class ResourceTarget {
 
-    private final boolean adjustForRedundancy;
-
     /** The target real resources per node, assuming the node assignment where this was decided */
     private final NodeResources resources;
 
-    private ResourceTarget(NodeResources resources, boolean adjustForRedundancy) {
+    private ResourceTarget(NodeResources resources) {
         this.resources = resources;
-        this.adjustForRedundancy = adjustForRedundancy;
     }
 
-    /** Are the target resources given by this including redundancy or not */
-    public boolean adjustForRedundancy() { return adjustForRedundancy; }
-    
     /** Returns the target resources per node in terms of the current allocation */
     public NodeResources resources() { return resources; }
 
     @Override
     public String toString() {
-        return "target " + resources + (adjustForRedundancy ? "(with redundancy adjustment) " : "");
+        return "target " + resources;
     }
 
     /** Create a target of achieving ideal load given a current load */
     public static ResourceTarget idealLoad(ClusterModel clusterModel,
                                            AllocatableClusterResources current) {
-        System.out.println("Adjustment: " + clusterModel.loadAdjustment());
-        System.out.println("Target:     " + new ResourceTarget(clusterModel.loadAdjustment().scaled(current.realResources().nodeResources()), false));
-        return new ResourceTarget(clusterModel.loadAdjustment().scaled(current.realResources().nodeResources()), true);
+        return new ResourceTarget(clusterModel.loadAdjustment().scaled(current.realResources().nodeResources()));
     }
 
     /** Crete a target of preserving a current allocation */
-    public static ResourceTarget preserve(AllocatableClusterResources current) {
-        return new ResourceTarget(current.realResources().nodeResources(), false);
+    public static ResourceTarget preserve(ClusterModel clusterModel,
+                                          AllocatableClusterResources current) {
+        return new ResourceTarget(current.realResources().nodeResources());
     }
 
 }