diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-07-05 16:34:36 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-07-05 16:34:36 +0200 |
commit | 72cb35b530d020bad5f4968e763089d7b9102753 (patch) | |
tree | 55d44dfd857354824e80f790a195fc66bf5dff9d | |
parent | 1ecd90b29e762d8686dd637bc96925a3cd147684 (diff) |
Include instance in ownership summary
2 files changed, 10 insertions, 7 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/ApplicationSummary.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/ApplicationSummary.java index 1d23cd52d23..01045eec020 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/ApplicationSummary.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/ApplicationSummary.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.organization; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.zone.ZoneId; +import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import java.time.Instant; import java.util.Map; @@ -20,10 +21,10 @@ public class ApplicationSummary { private final Optional<Instant> lastQueried; private final Optional<Instant> lastWritten; private final Optional<Instant> lastBuilt; - private final Map<ZoneId, Metric> metrics; + private final Map<DeploymentId, Metric> metrics; public ApplicationSummary(ApplicationId application, Optional<Instant> lastQueried, Optional<Instant> lastWritten, - Optional<Instant> lastBuilt, Map<ZoneId, Metric> metrics) { + Optional<Instant> lastBuilt, Map<DeploymentId, Metric> metrics) { this.application = Objects.requireNonNull(application); this.lastQueried = Objects.requireNonNull(lastQueried); this.lastWritten = Objects.requireNonNull(lastWritten); @@ -47,7 +48,7 @@ public class ApplicationSummary { return lastBuilt; } - public Map<ZoneId, Metric> metrics() { + public Map<DeploymentId, Metric> metrics() { return metrics; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java index 7398b7e977e..de087737320 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java @@ -6,6 +6,7 @@ import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.ApplicationController; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.Instance; +import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.integration.organization.ApplicationSummary; import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId; import com.yahoo.vespa.hosted.controller.api.integration.organization.OwnershipIssues; @@ -77,14 +78,15 @@ public class ApplicationOwnershipConfirmer extends ControllerMaintainer { private ApplicationSummary summaryOf(TenantAndApplicationId application) { var app = applications.requireApplication(application); - var metrics = new HashMap<ZoneId, ApplicationSummary.Metric>(); + var metrics = new HashMap<DeploymentId, ApplicationSummary.Metric>(); for (Instance instance : app.instances().values()) { for (var kv : instance.deployments().entrySet()) { var zone = kv.getKey(); var deploymentMetrics = kv.getValue().metrics(); - metrics.put(zone, new ApplicationSummary.Metric(deploymentMetrics.documentCount(), - deploymentMetrics.queriesPerSecond(), - deploymentMetrics.writesPerSecond())); + metrics.put(new DeploymentId(instance.id(), zone), + new ApplicationSummary.Metric(deploymentMetrics.documentCount(), + deploymentMetrics.queriesPerSecond(), + deploymentMetrics.writesPerSecond())); } } return new ApplicationSummary(app.id().defaultInstance(), app.activity().lastQueried(), app.activity().lastWritten(), |