From 9ad775311f3e2c4fd90bd1c5bdae8d10155e8e92 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Thu, 20 Sep 2018 14:41:21 +0200 Subject: Cache rotation status in DeploymentMetricsMaintainer --- .../hosted/controller/api/integration/MetricsService.java | 10 +++++++++- .../api/integration/routing/GlobalRoutingService.java | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'controller-api') diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java index 20e9710f092..ff0628ccccc 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java @@ -1,9 +1,12 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.HostName; +import com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; +import java.util.Collections; import java.util.Map; /** @@ -17,6 +20,11 @@ public interface MetricsService { DeploymentMetrics getDeploymentMetrics(ApplicationId application, ZoneId zone); + // TODO: Remove default once implementation catches up + default Map getRotationStatus(String rotationName) { + return Collections.emptyMap(); + } + Map getSystemMetrics(ApplicationId application, ZoneId zone); class DeploymentMetrics { diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java index d49d6a9e4c2..5a5f775c013 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java @@ -8,6 +8,7 @@ import java.util.Map; * * @author mpolden */ +// TODO: Remove once DeploymentMetricsMaintainer starts providing rotation status public interface GlobalRoutingService { /** Returns the health status for each endpoint behind the given rotation name */ -- cgit v1.2.3