diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-12 16:25:23 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-12 16:25:23 +0200 |
commit | f222275505d0f83ed557b9b94fd2d2a5615ca5d8 (patch) | |
tree | e0668e81f4b33f048631a726b2664dacd0aface1 /configserver/src | |
parent | 43830a7f7975080dbc4c25804a2506ab102c7868 (diff) |
Add method to use Duration as timeout to make unit explicit, and avoid many magic conversions.
Diffstat (limited to 'configserver/src')
4 files changed, 6 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java index 23df938e0b7..c80faa2375a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java @@ -65,7 +65,7 @@ public class FileDistributionStatus extends AbstractComponent { HostStatus getHostStatus(String hostname, int port, Duration timeout) { Target target = supervisor.connect(new Spec(hostname, port)); Request request = new Request("filedistribution.getActiveFileReferencesStatus"); - target.invokeSync(request, timeout.toMillis() / 1000); + target.invokeSync(request, timeout); HostStatus hostStatus = createHostStatusFromResponse(hostname, request); target.close(); return hostStatus; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java index abb8a3e8487..7d7d4aa1d7d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java @@ -10,6 +10,7 @@ import com.yahoo.jrt.StringArray; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; +import java.time.Duration; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -20,7 +21,7 @@ import java.util.logging.Logger; public class FileDistributionImpl implements FileDistribution, RequestWaiter { private final static Logger log = Logger.getLogger(FileDistributionImpl.class.getName()); - private final static double rpcTimeout = 1.0; + private final static Duration rpcTimeout = Duration.ofSeconds(1); private final Supervisor supervisor; 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 6518957a4ab..b36967d76a4 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 @@ -45,6 +45,7 @@ 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; import java.util.Collection; import java.util.Collections; @@ -571,7 +572,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList private void invokeRpcIfValidConnection(Request request) { if (target.isValid()) { - target.invokeSync(request, 600); + target.invokeSync(request, Duration.ofMinutes(10)); } else { throw new RuntimeException("Connection to " + target + " is invalid", target.getConnectionLostReason()); } 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 40ed20b7969..441f6c3a6ce 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 @@ -166,7 +166,7 @@ public class RpcTester implements AutoCloseable { void performRequest(Request req) { clock.advance(Duration.ofMillis(10)); - sup.connect(spec).invokeSync(req, 10.0); + sup.connect(spec).invokeSync(req, Duration.ofSeconds(10)); if (req.methodName().equals(RpcServer.getConfigMethodName)) assertEquals(clock.instant(), hostLivenessTracker.lastRequestFrom(myHostname).get()); } |