aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2020-10-08 16:38:17 +0200
committerØyvind Grønnesby <oyving@verizonmedia.com>2020-10-08 16:38:17 +0200
commitda32182eeb75a797e7ac12d8db415cdabe987661 (patch)
tree96a462bb851ff529b1b556ed8ee7f53f59edb049 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
parentb0ab9ed9ebc8908b9fec91d26119d4bc270a07c0 (diff)
Query for quota usage on deploy
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
index 243566c72bd..e2ff017caac 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.hosted.controller.application.AssignedRotation;
import com.yahoo.vespa.hosted.controller.application.Change;
import com.yahoo.vespa.hosted.controller.application.Deployment;
import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
+import com.yahoo.vespa.hosted.controller.application.QuotaUsage;
import com.yahoo.vespa.hosted.controller.rotation.RotationStatus;
import java.time.Instant;
@@ -62,14 +63,14 @@ public class Instance {
}
public Instance withNewDeployment(ZoneId zone, ApplicationVersion applicationVersion, Version version,
- Instant instant, Map<DeploymentMetrics.Warning, Integer> warnings) {
+ Instant instant, Map<DeploymentMetrics.Warning, Integer> warnings, QuotaUsage quotaUsage) {
// Use info from previous deployment if available, otherwise create a new one.
Deployment previousDeployment = deployments.getOrDefault(zone, new Deployment(zone, applicationVersion,
version, instant));
Deployment newDeployment = new Deployment(zone, applicationVersion, version, instant,
previousDeployment.metrics().with(warnings),
previousDeployment.activity(),
- previousDeployment.quota());
+ quotaUsage);
return with(newDeployment);
}