diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-10-23 13:42:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 13:42:43 +0200 |
commit | e0715a4f91d8e5e140794fe511f029f34ed71cbd (patch) | |
tree | 63dc727a1cf167b3c69396f78560886fea3b8e8b /node-repository/src | |
parent | 79c1773d3353863451e0d75243e280c40b6658b0 (diff) | |
parent | eee741266e6469cbdfa1ff551253764421d3b0a8 (diff) |
Merge pull request #3842 from vespa-engine/hakonhall/make-slobrokmonitormanager-a-component
Make SlobrokMonitorManager a component
Diffstat (limited to 'node-repository/src')
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()) { |