diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-08-03 09:41:09 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-08-03 09:41:09 +0200 |
commit | 82562bda44fe7f8f552449a0cd4596397a716202 (patch) | |
tree | 629b0d56787782b0028b51eff6325f60b736f748 /service-monitor | |
parent | 6a132714b5123f917ff068431cb564d6f7a48d35 (diff) |
adminserver and topleveldispatch service names do not exist anymore
Diffstat (limited to 'service-monitor')
2 files changed, 8 insertions, 12 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java index 2fa97d41284..b2696f8573f 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java @@ -122,7 +122,6 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { */ Optional<String> findSlobrokServiceName(ServiceType serviceType, ConfigId configId) { switch (serviceType.s()) { - case "adminserver": case "config-sentinel": case "configproxy": case "configserver": @@ -133,9 +132,6 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager { case "transactionlogserver": return Optional.empty(); - case "topleveldispatch": - return Optional.of(configId.s()); - case "qrserver": case "container": case "container-clustercontroller": diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java index aa467e5a779..eca7d695be6 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java @@ -49,21 +49,21 @@ public class SlobrokMonitorManagerImplTest { @Test public void testGetStatus_ApplicationNotInSlobrok() { when(slobrokMonitor.registeredInSlobrok("config.id")).thenReturn(true); - assertEquals(ServiceStatus.DOWN, getStatus("topleveldispatch")); + assertEquals(ServiceStatus.DOWN, getStatus("container")); } @Test public void testGetStatus_ApplicationInSlobrok() { slobrokMonitorManager.applicationActivated(application); - when(slobrokMonitor.registeredInSlobrok("config.id")).thenReturn(true); - assertEquals(ServiceStatus.UP, getStatus("topleveldispatch")); + when(slobrokMonitor.registeredInSlobrok("vespa/service/config.id")).thenReturn(true); + assertEquals(ServiceStatus.UP, getStatus("container")); } @Test public void testGetStatus_ServiceNotInSlobrok() { slobrokMonitorManager.applicationActivated(application); - when(slobrokMonitor.registeredInSlobrok("config.id")).thenReturn(false); - assertEquals(ServiceStatus.DOWN, getStatus("topleveldispatch")); + when(slobrokMonitor.registeredInSlobrok("storage/cluster.config.id")).thenReturn(false); + assertEquals(ServiceStatus.DOWN, getStatus("storagenode")); } @Test @@ -82,12 +82,12 @@ public class SlobrokMonitorManagerImplTest { @Test public void testLookup() { assertEquals( - Optional.of("config.id"), - findSlobrokServiceName("topleveldispatch", "config.id")); + Optional.of("vespa/service/config.id"), + findSlobrokServiceName("container", "config.id")); assertEquals( Optional.empty(), - findSlobrokServiceName("adminserver", "config.id")); + findSlobrokServiceName("logserver", "config.id")); } private Optional<String> findSlobrokServiceName(String serviceType, String configId) { |