diff options
author | Håkon Hallingstad <hakon@oath.com> | 2017-10-23 12:19:14 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2017-10-23 12:19:14 +0200 |
commit | eee741266e6469cbdfa1ff551253764421d3b0a8 (patch) | |
tree | c503306aa6233a414360518f74b6ccff2276539f /node-repository | |
parent | 59262d80a4c037acc5b944f30f09582797fad3d5 (diff) |
Make SlobrokMonitorManager a component
To get insights into the Slobrok data used by the service monitor, it would be
useful to expose SlobrokMonitorManager. For instance it could provide a list of
name/spec pairs of services that are up (added as ServiceMonitorManager::lookup
in this PR).
The first step towards this is making SlobrokMonitorManager a component.
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java index 2dc9f515e7e..1c81d97ddea 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java @@ -187,7 +187,7 @@ public class NodeFailer extends Maintainer { */ private List<Node> determineActiveNodeDownStatus() { List<Node> downNodes = new ArrayList<>(); - for (ApplicationInstance application : serviceMonitor.queryStatusOfAllApplicationInstances().values()) { + for (ApplicationInstance application : serviceMonitor.getAllApplicationInstances().values()) { for (ServiceCluster cluster : application.serviceClusters()) { for (ServiceInstance service : cluster.serviceInstances()) { Optional<Node> node = nodeRepository().getNode(service.hostName().s(), Node.State.active); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java index 2a00724de28..56e5fcafbde 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java @@ -67,7 +67,7 @@ public class ServiceMonitorStub implements ServiceMonitor { } @Override - public Map<ApplicationInstanceReference, ApplicationInstance> queryStatusOfAllApplicationInstances() { + public Map<ApplicationInstanceReference, ApplicationInstance> getAllApplicationInstances() { // Convert apps information to the response payload to return Map<ApplicationInstanceReference, ApplicationInstance> status = new HashMap<>(); for (Map.Entry<ApplicationId, MockDeployer.ApplicationContext> app : apps.entrySet()) { |