diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-02-08 09:02:53 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-02-08 09:02:53 +0100 |
commit | d2419acb0eae2e9d4895d82607dd64aac563aafa (patch) | |
tree | b002866ae61c66042f8c7d7c997092e32dc70927 /service-monitor/src/main/java/com/yahoo | |
parent | 6b90277a622c2ed3fabff61e67b19228133ac189 (diff) |
Simplify, using pre-computed host-to-application map
Diffstat (limited to 'service-monitor/src/main/java/com/yahoo')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceMonitorImpl.java | 7 | ||||
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java | 9 |
2 files changed, 3 insertions, 13 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceMonitorImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceMonitorImpl.java index 50ea31eb9c4..0a40555036c 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceMonitorImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceMonitorImpl.java @@ -17,6 +17,7 @@ import com.yahoo.vespa.service.slobrok.SlobrokMonitorManagerImpl; import java.util.Map; public class ServiceMonitorImpl implements ServiceMonitor { + private final ServiceModelCache serviceModelProvider; @Inject @@ -37,12 +38,8 @@ public class ServiceMonitorImpl implements ServiceMonitor { } @Override - public Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances() { - return serviceModelProvider.get().getAllApplicationInstances(); - } - - @Override public ServiceModel getServiceModelSnapshot() { return serviceModelProvider.get(); } + } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java index 5ed34673da5..49539c61e5d 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java @@ -1,11 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.service.monitor; -import com.yahoo.vespa.applicationmodel.ApplicationInstance; -import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; - -import java.util.Map; - /** * The service monitor interface. A service monitor provides up to date information about the liveness status * (up, down or not known) of each service instance in a Vespa zone @@ -15,11 +10,9 @@ import java.util.Map; public interface ServiceMonitor { /** - * Returns the current liveness status (up, down or unknown) of all instances + * Returns a ServiceModel which contains the current liveness status (up, down or unknown) of all instances * of all services of all clusters of all applications in a zone. */ - Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances(); - ServiceModel getServiceModelSnapshot(); } |