diff options
Diffstat (limited to 'service-monitor/src/main/java/com/yahoo/vespa')
4 files changed, 13 insertions, 28 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/HealthMonitorManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/HealthMonitorManager.java index fd7c77e2a20..44f2f4088df 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/HealthMonitorManager.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/HealthMonitorManager.java @@ -9,8 +9,6 @@ import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceStatusInfo; import com.yahoo.vespa.applicationmodel.ServiceType; -import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.service.duper.DuperModelManager; import com.yahoo.vespa.service.executor.RunletExecutorImpl; import com.yahoo.vespa.service.manager.HealthMonitorApi; @@ -56,14 +54,11 @@ public class HealthMonitorManager implements MonitorManager, HealthMonitorApi { private final ApplicationHealthMonitorFactory applicationHealthMonitorFactory; @Inject - public HealthMonitorManager(DuperModelManager duperModel, FlagSource flagSource) { - this(duperModel, - new StateV1HealthModel( - TARGET_HEALTH_STALENESS, - HEALTH_REQUEST_TIMEOUT, - KEEP_ALIVE, - new RunletExecutorImpl(THREAD_POOL_SIZE), - Flags.USE_UNKNOWN_SERVICE_STATUS.bindTo(flagSource).value())); + public HealthMonitorManager(DuperModelManager duperModel) { + this(duperModel, new StateV1HealthModel(TARGET_HEALTH_STALENESS, + HEALTH_REQUEST_TIMEOUT, + KEEP_ALIVE, + new RunletExecutorImpl(THREAD_POOL_SIZE))); } private HealthMonitorManager(DuperModelManager duperModel, StateV1HealthModel healthModel) { diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java index 2128d2b77c3..3bdf8711d65 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java @@ -20,7 +20,6 @@ class StateV1HealthEndpoint implements HealthEndpoint { private final Duration connectionKeepAlive; private final Duration delay; private final RunletExecutor executor; - private boolean useUnknownServiceStatus; StateV1HealthEndpoint(ServiceId serviceId, HostName hostname, @@ -28,12 +27,10 @@ class StateV1HealthEndpoint implements HealthEndpoint { Duration delay, Duration requestTimeout, Duration connectionKeepAlive, - RunletExecutor executor, - boolean useUnknownServiceStatus) { + RunletExecutor executor) { this.serviceId = serviceId; this.delay = delay; this.executor = executor; - this.useUnknownServiceStatus = useUnknownServiceStatus; this.url = uncheck(() -> new URL("http", hostname.value(), port, "/state/v1/health")); this.requestTimeout = requestTimeout; this.connectionKeepAlive = connectionKeepAlive; @@ -46,7 +43,7 @@ class StateV1HealthEndpoint implements HealthEndpoint { @Override public HealthMonitor startMonitoring() { - var updater = new StateV1HealthUpdater(url, requestTimeout, connectionKeepAlive, useUnknownServiceStatus); + var updater = new StateV1HealthUpdater(url, requestTimeout, connectionKeepAlive); return new StateV1HealthMonitor(updater, executor, delay); } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java index 81a6d6d6013..0408e0134ea 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java @@ -30,18 +30,15 @@ public class StateV1HealthModel implements AutoCloseable { private final Duration requestTimeout; private final Duration connectionKeepAlive; private final RunletExecutor executor; - private final boolean useUnknownServiceStatus; StateV1HealthModel(Duration targetHealthStaleness, Duration requestTimeout, Duration connectionKeepAlive, - RunletExecutor executor, - boolean useUnknownServiceStatus) { + RunletExecutor executor) { this.targetHealthStaleness = targetHealthStaleness; this.requestTimeout = requestTimeout; this.connectionKeepAlive = connectionKeepAlive; this.executor = executor; - this.useUnknownServiceStatus = useUnknownServiceStatus; } Map<ServiceId, HealthEndpoint> extractHealthEndpoints(ApplicationInfo application) { @@ -60,8 +57,7 @@ public class StateV1HealthModel implements AutoCloseable { targetHealthStaleness, requestTimeout, connectionKeepAlive, - executor, - useUnknownServiceStatus); + executor); endpoints.put(serviceId, endpoint); break; // Avoid >1 endpoints per serviceId } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java index c544ea4b8b4..52a032f319f 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthUpdater.java @@ -24,16 +24,13 @@ class StateV1HealthUpdater implements HealthUpdater { private final String endpoint; private final StateV1HealthClient healthClient; - private volatile ServiceStatusInfo serviceStatusInfo; + private volatile ServiceStatusInfo serviceStatusInfo = new ServiceStatusInfo(ServiceStatus.UNKNOWN); - StateV1HealthUpdater(URL url, Duration requestTimeout, Duration connectionKeepAlive, - boolean useUnknownServiceStatus) { - this(url.toString(), new StateV1HealthClient(url, requestTimeout, connectionKeepAlive), useUnknownServiceStatus); + StateV1HealthUpdater(URL url, Duration requestTimeout, Duration connectionKeepAlive) { + this(url.toString(), new StateV1HealthClient(url, requestTimeout, connectionKeepAlive)); } - StateV1HealthUpdater(String endpoint, StateV1HealthClient healthClient, boolean useUnknownServiceStatus) { - var serviceStatus = useUnknownServiceStatus ? ServiceStatus.UNKNOWN : ServiceStatus.NOT_CHECKED; - this.serviceStatusInfo = new ServiceStatusInfo(serviceStatus); + StateV1HealthUpdater(String endpoint, StateV1HealthClient healthClient) { this.endpoint = endpoint; this.healthClient = healthClient; } |