Remove maintainer acting on unavailable metrics

5 files changed, 1 insertions, 104 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Deployment.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Deployment.java
index b9be68f6de1..03d084cd9e3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Deployment.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Deployment.java
@@ -75,6 +75,7 @@ public class Deployment {
     }
 
     /** Returns utilization of the clusters allocated to this */
+    // TODO(mpolden): No longer updated. Remove this and associated serialization
     public Map<Id, ClusterUtilization> clusterUtils() {
         return clusterUtilization;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java
deleted file mode 100644
index 865084064a2..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.maintenance;
-
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ClusterSpec;
-import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.hosted.controller.Application;
-import com.yahoo.vespa.hosted.controller.Controller;
-import com.yahoo.vespa.hosted.controller.api.integration.metrics.MetricsService;
-import com.yahoo.vespa.hosted.controller.application.ClusterUtilization;
-import com.yahoo.vespa.hosted.controller.application.Deployment;
-
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Predicate;
-
-/**
- * Fetch utilization metrics and update applications with this data.
- *
- * @author smorgrav
- */
-public class ClusterUtilizationMaintainer extends Maintainer {
-
-    private final Controller controller;
-
-    public ClusterUtilizationMaintainer(Controller controller, Duration duration, JobControl jobControl) {
-        super(controller, duration, jobControl, null, SystemName.allOf(Predicate.not(SystemName::isPublic)));
-        this.controller = controller;
-    }
-
-    private Map<ClusterSpec.Id, ClusterUtilization> getUpdatedClusterUtilizations(ApplicationId app, ZoneId zone) {
-        Map<String, MetricsService.SystemMetrics> systemMetrics = controller.metricsService().getSystemMetrics(app, zone);
-
-        Map<ClusterSpec.Id, ClusterUtilization> utilizationMap = new HashMap<>();
-        for (Map.Entry<String, MetricsService.SystemMetrics> metrics : systemMetrics.entrySet()) {
-            MetricsService.SystemMetrics systemMetric = metrics.getValue();
-            ClusterUtilization utilization = new ClusterUtilization(systemMetric.memUtil() / 100, systemMetric.cpuUtil() / 100, systemMetric.diskUtil() / 100, 0);
-            utilizationMap.put(new ClusterSpec.Id(metrics.getKey()), utilization);
-        }
-
-        return utilizationMap;
-    }
-
-    @Override
-    protected void maintain() {
-        for (Application application : controller().applications().asList()) {
-            for (Deployment deployment : application.deployments().values()) {
-
-                Map<ClusterSpec.Id, ClusterUtilization> clusterUtilization = getUpdatedClusterUtilizations(application.id(), deployment.zone());
-
-                controller().applications().lockIfPresent(application.id(), lockedApplication ->
-                    controller().applications().store(lockedApplication.withClusterUtilization(deployment.zone(), clusterUtilization)));
-            }
-        }
-    }
-
-}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
index 7c3188d9d28..23c2db843d3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
@@ -42,7 +42,6 @@ public class ControllerMaintenance extends AbstractComponent {
     private final Upgrader upgrader;
     private final ReadyJobsTrigger readyJobsTrigger;
     private final ClusterInfoMaintainer clusterInfoMaintainer;
-    private final ClusterUtilizationMaintainer clusterUtilizationMaintainer;
     private final DeploymentMetricsMaintainer deploymentMetricsMaintainer;
     private final ApplicationOwnershipConfirmer applicationOwnershipConfirmer;
     private final SystemUpgrader systemUpgrader;
@@ -78,7 +77,6 @@ public class ControllerMaintenance extends AbstractComponent {
         upgrader = new Upgrader(controller, maintenanceInterval, jobControl, curator);
         readyJobsTrigger = new ReadyJobsTrigger(controller, Duration.ofMinutes(1), jobControl);
         clusterInfoMaintainer = new ClusterInfoMaintainer(controller, Duration.ofHours(2), jobControl);
-        clusterUtilizationMaintainer = new ClusterUtilizationMaintainer(controller, Duration.ofHours(2), jobControl);
         deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(controller, Duration.ofMinutes(5), jobControl);
         applicationOwnershipConfirmer = new ApplicationOwnershipConfirmer(controller, Duration.ofHours(12), jobControl, ownershipIssues);
         systemUpgrader = new SystemUpgrader(controller, Duration.ofMinutes(1), jobControl);
@@ -108,7 +106,6 @@ public class ControllerMaintenance extends AbstractComponent {
         versionStatusUpdater.deconstruct();
         upgrader.deconstruct();
         readyJobsTrigger.deconstruct();
-        clusterUtilizationMaintainer.deconstruct();
         clusterInfoMaintainer.deconstruct();
         deploymentMetricsMaintainer.deconstruct();
         applicationOwnershipConfirmer.deconstruct();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
deleted file mode 100644
index 66be2d09797..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.maintenance;
-
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ClusterSpec;
-import com.yahoo.config.provision.Environment;
-import com.yahoo.vespa.hosted.controller.ControllerTester;
-import com.yahoo.vespa.hosted.controller.application.Deployment;
-import com.yahoo.vespa.hosted.controller.persistence.MockCuratorDb;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.time.Duration;
-
-/**
- * @author smorgrav
- */
-public class ClusterUtilizationMaintainerTest {
-
-    @Test
-    public void maintain() {
-        ControllerTester tester = new ControllerTester();
-        ApplicationId app = tester.createAndDeploy("tenant1", "domain1", "app1", Environment.dev, 123).id();
-
-        // Precondition: no cluster info attached to the deployments
-        Deployment deployment = tester.controller().applications().get(app).get().deployments().values().stream().findAny().get();
-        Assert.assertEquals(0, deployment.clusterUtils().size());
-
-        ClusterUtilizationMaintainer mainainer = new ClusterUtilizationMaintainer(tester.controller(), Duration.ofHours(1), new JobControl(new MockCuratorDb()));
-        mainainer.maintain();
-
-        deployment = tester.controller().applications().get(app).get().deployments().values().stream().findAny().get();
-        Assert.assertEquals(1, deployment.clusterUtils().size());
-        Assert.assertEquals(0.5554, deployment.clusterUtils().get(ClusterSpec.Id.from("default")).getCpu(), Double.MIN_VALUE);
-    }
-
-}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
index c8ab8a92583..4dfd6dcfaad 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
@@ -13,9 +13,6 @@
       "name": "ClusterInfoMaintainer"
     },
     {
-      "name": "ClusterUtilizationMaintainer"
-    },
-    {
       "name": "ContactInformationMaintainer"
     },
     {