From e3676a710abe26a3293ce5a9d676d62b3b388bac Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Thu, 13 Oct 2022 15:56:07 +0200 Subject: Remove HostLivenessTracker --- .../host/ConfigRequestHostLivenessTracker.java | 45 ---------------------- .../config/server/rpc/GetConfigProcessor.java | 2 +- .../yahoo/vespa/config/server/rpc/RpcServer.java | 12 ++---- .../main/resources/configserver-app/services.xml | 1 - .../vespa/config/server/rpc/MockRpcServer.java | 2 - .../yahoo/vespa/config/server/rpc/RpcTester.java | 7 ---- 6 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 configserver/src/main/java/com/yahoo/vespa/config/server/host/ConfigRequestHostLivenessTracker.java (limited to 'configserver/src') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/host/ConfigRequestHostLivenessTracker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/host/ConfigRequestHostLivenessTracker.java deleted file mode 100644 index 9195f78b23b..00000000000 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/host/ConfigRequestHostLivenessTracker.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server.host; - -import com.yahoo.component.annotation.Inject; -import com.yahoo.config.provision.HostLivenessTracker; - -import java.time.Clock; -import java.time.Instant; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Keeps track of the last config request made by each hostname. - * This always remembers all requests forever since the moment is is constructed. - * This is the implementation which will be injected to components who request a HostLivenessTracker. - * - * @author bratseth - */ -public class ConfigRequestHostLivenessTracker implements HostLivenessTracker { - - private final Clock clock; - private final Map lastRequestFromHost = new ConcurrentHashMap<>(); - - @Inject - @SuppressWarnings("unused") - public ConfigRequestHostLivenessTracker() { - this(Clock.systemUTC()); - } - - public ConfigRequestHostLivenessTracker(Clock clock) { - this.clock = clock; - } - - @Override - public void receivedRequestFrom(String hostname) { - lastRequestFromHost.put(hostname, clock.instant()); - } - - @Override - public Optional lastRequestFrom(String hostname) { - return Optional.ofNullable(lastRequestFromHost.get(hostname)); - } - -} diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index b7327ef3aa7..1c419ce047a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -20,6 +20,7 @@ import com.yahoo.vespa.config.protocol.VespaVersion; import com.yahoo.vespa.config.server.GetConfigContext; import com.yahoo.vespa.config.server.UnknownConfigDefinitionException; import com.yahoo.vespa.config.server.tenant.TenantRepository; + import java.util.Optional; import java.util.Set; import java.util.logging.Level; @@ -150,7 +151,6 @@ class GetConfigProcessor implements Runnable { @Override public void run() { - rpcServer.hostLivenessTracker().receivedRequestFrom(request.getClientHostName()); Pair delayed = getConfig(request); if (delayed != null) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java index b36967d76a4..a2461706f11 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java @@ -7,7 +7,6 @@ import com.yahoo.component.annotation.Inject; import com.yahoo.concurrent.ThreadFactoryFactory; import com.yahoo.config.FileReference; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.HostLivenessTracker; import com.yahoo.config.provision.TenantName; import com.yahoo.jrt.Acceptor; import com.yahoo.jrt.DataValue; @@ -27,8 +26,8 @@ import com.yahoo.vespa.config.protocol.ConfigResponse; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3; import com.yahoo.vespa.config.protocol.Trace; -import com.yahoo.vespa.config.server.GetConfigContext; import com.yahoo.vespa.config.server.ConfigActivationListener; +import com.yahoo.vespa.config.server.GetConfigContext; import com.yahoo.vespa.config.server.RequestHandler; import com.yahoo.vespa.config.server.SuperModelRequestHandler; import com.yahoo.vespa.config.server.application.ApplicationSet; @@ -44,6 +43,7 @@ import com.yahoo.vespa.filedistribution.FileDownloader; import com.yahoo.vespa.filedistribution.FileReceiver; import com.yahoo.vespa.filedistribution.FileReferenceData; import com.yahoo.vespa.filedistribution.FileReferenceDownload; + import java.nio.ByteBuffer; import java.time.Duration; import java.util.Arrays; @@ -102,7 +102,6 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList private final SuperModelRequestHandler superModelRequestHandler; private final MetricUpdater metrics; private final MetricUpdaterFactory metricUpdaterFactory; - private final HostLivenessTracker hostLivenessTracker; private final FileServer fileServer; private final RpcAuthorizer rpcAuthorizer; @@ -128,13 +127,12 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList @Inject public RpcServer(ConfigserverConfig config, SuperModelRequestHandler superModelRequestHandler, MetricUpdaterFactory metrics, HostRegistry hostRegistry, - HostLivenessTracker hostLivenessTracker, FileServer fileServer, RpcAuthorizer rpcAuthorizer, + FileServer fileServer, RpcAuthorizer rpcAuthorizer, RpcRequestHandlerProvider handlerProvider) { this.superModelRequestHandler = superModelRequestHandler; metricUpdaterFactory = metrics; supervisor.setMaxOutputBufferSize(config.maxoutputbuffersize()); this.metrics = metrics.getOrCreateMetricUpdater(Collections.emptyMap()); - this.hostLivenessTracker = hostLivenessTracker; BlockingQueue workQueue = new LinkedBlockingQueue<>(config.maxgetconfigclients()); int rpcWorkerThreads = (config.numRpcThreads() == 0) ? threadsToUse() : config.numRpcThreads(); executorService = new ThreadPoolExecutor(rpcWorkerThreads, rpcWorkerThreads, @@ -613,8 +611,4 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList req.returnValues().add(new Int32Value(0)); }); } - - HostLivenessTracker hostLivenessTracker() { - return hostLivenessTracker; - } } diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 650176829e6..b8397722b3d 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -30,7 +30,6 @@ - diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java index 3272689473e..0f9ce9eff13 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java @@ -7,7 +7,6 @@ import com.yahoo.vespa.config.protocol.ConfigResponse; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import com.yahoo.vespa.config.server.GetConfigContext; import com.yahoo.vespa.config.server.filedistribution.FileServer; -import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker; import com.yahoo.vespa.config.server.host.HostRegistry; import com.yahoo.vespa.config.server.monitoring.Metrics; import com.yahoo.vespa.config.server.rpc.security.NoopRpcAuthorizer; @@ -38,7 +37,6 @@ public class MockRpcServer extends RpcServer { null, Metrics.createTestMetrics(), new HostRegistry(), - new ConfigRequestHostLivenessTracker(), new FileServer(tempDir), new NoopRpcAuthorizer(), new RpcRequestHandlerProvider()); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java index 441f6c3a6ce..e5ed4e4673d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server.rpc; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.HostLivenessTracker; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.jrt.Request; @@ -21,7 +20,6 @@ import com.yahoo.vespa.config.server.SuperModelRequestHandler; import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.OrchestratorMock; import com.yahoo.vespa.config.server.filedistribution.FileServer; -import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker; import com.yahoo.vespa.config.server.host.HostRegistry; import com.yahoo.vespa.config.server.monitoring.Metrics; import com.yahoo.vespa.config.server.rpc.security.NoopRpcAuthorizer; @@ -51,7 +49,6 @@ public class RpcTester implements AutoCloseable { private final ManualClock clock = new ManualClock(Instant.ofEpochMilli(100)); private final String myHostname = HostName.getLocalhost(); - private final HostLivenessTracker hostLivenessTracker = new ConfigRequestHostLivenessTracker(clock); private final Spec spec; private final RpcServer rpcServer; @@ -95,7 +92,6 @@ public class RpcTester implements AutoCloseable { .withProvisioner(new MockProvisioner()) .withOrchestrator(new OrchestratorMock()) .build(); - assertFalse(hostLivenessTracker.lastRequestFrom(myHostname).isPresent()); } public void close() { @@ -122,7 +118,6 @@ public class RpcTester implements AutoCloseable { new InMemoryFlagSource())), Metrics.createTestMetrics(), hostRegistry, - hostLivenessTracker, new FileServer(temporaryFolder.newFolder()), new NoopRpcAuthorizer(), new RpcRequestHandlerProvider()); @@ -167,8 +162,6 @@ public class RpcTester implements AutoCloseable { void performRequest(Request req) { clock.advance(Duration.ofMillis(10)); sup.connect(spec).invokeSync(req, Duration.ofSeconds(10)); - if (req.methodName().equals(RpcServer.getConfigMethodName)) - assertEquals(clock.instant(), hostLivenessTracker.lastRequestFrom(myHostname).get()); } RpcServer rpcServer() { -- cgit v1.2.3