diff options
Diffstat (limited to 'config/src/main/java/com/yahoo/vespa')
4 files changed, 11 insertions, 6 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/Connection.java b/config/src/main/java/com/yahoo/vespa/config/Connection.java index ea6419c62e1..69e8fcf9963 100644 --- a/config/src/main/java/com/yahoo/vespa/config/Connection.java +++ b/config/src/main/java/com/yahoo/vespa/config/Connection.java @@ -4,14 +4,16 @@ package com.yahoo.vespa.config; import com.yahoo.jrt.Request; import com.yahoo.jrt.RequestWaiter; +import java.time.Duration; + /** * @author hmusum */ public interface Connection { - void invokeAsync(Request request, double jrtTimeout, RequestWaiter requestWaiter); + void invokeAsync(Request request, Duration jrtTimeout, RequestWaiter requestWaiter); - void invokeSync(Request request, double jrtTimeout); + void invokeSync(Request request, Duration jrtTimeout); String getAddress(); diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java index 2d7c96febd6..f2a104696c1 100644 --- a/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java +++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java @@ -7,6 +7,7 @@ import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; +import java.time.Duration; import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -30,12 +31,12 @@ public class JRTConnection implements Connection { } @Override - public void invokeAsync(Request request, double jrtTimeout, RequestWaiter requestWaiter) { + public void invokeAsync(Request request, Duration jrtTimeout, RequestWaiter requestWaiter) { getTarget().invokeAsync(request, jrtTimeout, requestWaiter); } @Override - public void invokeSync(Request request, double jrtTimeout) { + public void invokeSync(Request request, Duration jrtTimeout) { getTarget().invokeSync(request, jrtTimeout); } diff --git a/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java b/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java index b3a4590fdb2..62308315c95 100644 --- a/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java +++ b/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java @@ -11,6 +11,7 @@ import com.yahoo.jrt.Transport; import com.yahoo.vespa.defaults.Defaults; import java.io.File; +import java.time.Duration; import java.util.logging.Logger; import static java.util.logging.Level.FINE; @@ -47,7 +48,7 @@ public class UrlDownloader { target = supervisor.connect(spec); // ping to check if connection is working Request request = new Request("frt.rpc.ping"); - target.invokeSync(request, 5.0); + target.invokeSync(request, Duration.ofSeconds(5)); if (! request.isError()) { log.log(FINE, () -> "Successfully connected to '" + spec + "', this = " + System.identityHashCode(this)); return; diff --git a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java index 345118b5fd4..5b0f1351ff5 100644 --- a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java +++ b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java @@ -26,6 +26,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -239,7 +240,7 @@ public class LoadTester { System.out.println("# Requesting: " + reqKey); long start = System.nanoTime(); - target.invokeSync(request.getRequest(), 10.0); + target.invokeSync(request.getRequest(), Duration.ofSeconds(10)); long durationInMillis = (System.nanoTime() - start) / 1_000_000; if (request.isError()) { |