aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/test/java
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2022-10-14 09:25:48 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2022-10-14 09:25:56 +0200
commit967b349cfbdaa645ce09fded5bcafc16291d90b2 (patch)
treed79ca65e1511179b5094aa2ebde3edb2e8de2030 /configserver/src/test/java
parent0152c8b04cc6b3fe1f74ecc7af2449467c75802c (diff)
Reapply "Remove HostLivenessTracker"
This reverts commit a5ed12b351806b187613457b58982ca67f537594.
Diffstat (limited to 'configserver/src/test/java')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java7
2 files changed, 0 insertions, 9 deletions
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() {