From 92100f39dea78a928b0fc86de35420050e7d690d Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Sat, 1 Jun 2019 12:42:27 +0200 Subject: Remove MONITOR_TENANT_HOST_HEALTH flag --- .../service/health/HealthMonitorManagerTest.java | 54 +++++----------------- .../service/health/StateV1HealthModelTest.java | 10 ++-- .../slobrok/SlobrokMonitorManagerImplTest.java | 3 -- 3 files changed, 14 insertions(+), 53 deletions(-) (limited to 'service-monitor/src/test/java/com/yahoo') diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java index 0c0a644165d..89bcda05074 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java @@ -6,7 +6,6 @@ import com.yahoo.config.provision.HostName; import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceStatusInfo; -import com.yahoo.vespa.service.duper.ConfigServerApplication; import com.yahoo.vespa.service.duper.ControllerHostApplication; import com.yahoo.vespa.service.duper.DuperModelManager; import com.yahoo.vespa.service.duper.InfraApplication; @@ -14,6 +13,7 @@ import com.yahoo.vespa.service.duper.ProxyHostApplication; import com.yahoo.vespa.service.duper.TestZoneApplication; import com.yahoo.vespa.service.duper.ZoneApplication; import com.yahoo.vespa.service.monitor.ConfigserverUtil; +import org.junit.Before; import org.junit.Test; import java.util.List; @@ -29,21 +29,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; public class HealthMonitorManagerTest { - private final ConfigServerApplication configServerApplication = new ConfigServerApplication(); private final DuperModelManager duperModel = mock(DuperModelManager.class); private final ApplicationHealthMonitor monitor = mock(ApplicationHealthMonitor.class); private final ApplicationHealthMonitorFactory monitorFactory = mock(ApplicationHealthMonitorFactory.class); - private HealthMonitorManager manager; - - public void setUp(boolean monitorTenantHostHealth) { - manager = new HealthMonitorManager(duperModel, monitorTenantHostHealth, monitorFactory); - when(duperModel.getConfigServerApplication()).thenReturn(configServerApplication); - when(monitorFactory.create(any())).thenReturn(monitor); - } + private final HealthMonitorManager manager = new HealthMonitorManager(duperModel, monitorFactory); @Test public void addAndRemove() { - setUp(false); ApplicationInfo applicationInfo = ConfigserverUtil.makeExampleConfigServer(); when(duperModel.isSupportedInfraApplication(applicationInfo.getApplicationId())).thenReturn(true); @@ -56,30 +48,8 @@ public class HealthMonitorManagerTest { verify(monitor, times(1)).close(); } - @Test - public void withHostAdmin() { - setUp(false); - ServiceStatus status = manager.getStatus( - ZoneApplication.getApplicationId(), - ZoneApplication.getNodeAdminClusterId(), - ZoneApplication.getNodeAdminServiceType(), - new ConfigId("config-id-1")).serviceStatus(); - assertEquals(ServiceStatus.UP, status); - } - - @Test - public void verifyZoneApplicationIsNotMonitoredByDefault() { - verifyZoneApplicationIsMonitored(false, false); - } - @Test public void verifyZoneApplicationIsMonitored() { - verifyZoneApplicationIsMonitored(true, true); - } - - private void verifyZoneApplicationIsMonitored(boolean monitorTenantHostHealth, boolean isMonitored) { - setUp(monitorTenantHostHealth); - ApplicationInfo zoneApplicationInfo = new TestZoneApplication.Builder() .addNodeAdminCluster("h1", "h2") .addRoutingCluster("r1") @@ -89,18 +59,13 @@ public class HealthMonitorManagerTest { verify(monitorFactory, times(0)).create(zoneApplicationInfo.getApplicationId()); verify(monitor, times(0)).monitor(any()); manager.applicationActivated(zoneApplicationInfo); - verify(monitorFactory, times(isMonitored ? 1 : 0)).create(zoneApplicationInfo.getApplicationId()); - verify(monitor, times(isMonitored ? 1 : 0)).monitor(any()); + verify(monitorFactory).create(zoneApplicationInfo.getApplicationId()); + verify(monitor).monitor(any()); when(monitor.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.DOWN)); verifyNodeAdminGetStatus(0); - if (isMonitored) { - assertEquals(ServiceStatus.DOWN, getNodeAdminStatus()); - verifyNodeAdminGetStatus(1); - } else { - assertEquals(ServiceStatus.UP, getNodeAdminStatus()); - verifyNodeAdminGetStatus(0); - } + assertEquals(ServiceStatus.DOWN, getNodeAdminStatus()); + verifyNodeAdminGetStatus(1); verifyRoutingGetStatus(0); assertEquals(ServiceStatus.NOT_CHECKED, getRoutingStatus()); @@ -141,7 +106,6 @@ public class HealthMonitorManagerTest { @Test public void infrastructureApplication() { - setUp(false); ProxyHostApplication proxyHostApplication = new ProxyHostApplication(); when(duperModel.isSupportedInfraApplication(proxyHostApplication.getApplicationId())).thenReturn(true); List hostnames = Stream.of("proxyhost1", "proxyhost2").map(HostName::from).collect(Collectors.toList()); @@ -160,10 +124,14 @@ public class HealthMonitorManagerTest { @Test public void threadPoolSize() { - setUp(false); assertEquals(9, HealthMonitorManager.THREAD_POOL_SIZE); } + @Before + public void setup() { + when(monitorFactory.create(any())).thenReturn(monitor); + } + private void assertStatus(ServiceStatus expected, int verifyTimes, InfraApplication infraApplication, String hostname) { ServiceStatus actual = manager.getStatus( infraApplication.getApplicationId(), diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java index 9803fb75423..3fce1cca899 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java @@ -43,14 +43,11 @@ public class StateV1HealthModelTest { private final List hostnames = Stream.of("host1", "host2").map(HostName::from).collect(Collectors.toList()); private final ApplicationInfo proxyHostApplicationInfo = proxyHostApplication.makeApplicationInfo(hostnames); - private StateV1HealthModel model; - private Map endpoints; + private final StateV1HealthModel model = new StateV1HealthModel(healthStaleness, requestTimeout, keepAlive, executor); @Test public void test() { - model = new StateV1HealthModel(healthStaleness, requestTimeout, keepAlive, executor, false); - endpoints = model.extractHealthEndpoints(proxyHostApplicationInfo); - + Map endpoints = model.extractHealthEndpoints(proxyHostApplicationInfo); assertEquals(2, endpoints.size()); ApplicationId applicationId = ApplicationId.from("hosted-vespa", "proxy-host", "default"); @@ -75,14 +72,13 @@ public class StateV1HealthModelTest { @Test public void testMonitoringTenantHostHealth() { - model = new StateV1HealthModel(healthStaleness, requestTimeout, keepAlive, executor, true); ApplicationInfo zoneApplicationInfo = new TestZoneApplication.Builder() .addNodeAdminCluster("h1") .addRoutingCluster("r1") .build() .makeApplicationInfo(); - endpoints = model.extractHealthEndpoints(zoneApplicationInfo); + Map endpoints = model.extractHealthEndpoints(zoneApplicationInfo); assertEquals(1, endpoints.size()); HealthEndpoint endpoint = endpoints.values().iterator().next(); assertEquals("http://h1:8080/state/v1/health", endpoint.description()); 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 0b8a13a8869..e8953b57f79 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 @@ -7,7 +7,6 @@ import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; -import com.yahoo.vespa.service.duper.ConfigServerApplication; import com.yahoo.vespa.service.duper.DuperModelManager; import org.junit.Before; import org.junit.Test; @@ -27,7 +26,6 @@ public class SlobrokMonitorManagerImplTest { @SuppressWarnings("unchecked") private final Supplier slobrokMonitorFactory = mock(Supplier.class); - private final ConfigServerApplication configServerApplication = new ConfigServerApplication(); private final DuperModelManager duperModelManager = mock(DuperModelManager.class); private final SlobrokMonitorManagerImpl slobrokMonitorManager = new SlobrokMonitorManagerImpl(slobrokMonitorFactory, duperModelManager); @@ -38,7 +36,6 @@ public class SlobrokMonitorManagerImplTest { @Before public void setup() { - when(duperModelManager.getConfigServerApplication()).thenReturn(configServerApplication); when(slobrokMonitorFactory.get()).thenReturn(slobrokMonitor); when(application.getApplicationId()).thenReturn(applicationId); } -- cgit v1.2.3