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 /fileacquirer | |
parent | 43830a7f7975080dbc4c25804a2506ab102c7868 (diff) |
Add method to use Duration as timeout to make unit explicit, and avoid many magic conversions.
Diffstat (limited to 'fileacquirer')
-rw-r--r-- | fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java | 4 | ||||
-rw-r--r-- | fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/Timer.java | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java index c85a24db9bb..122027d706b 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java @@ -5,6 +5,8 @@ import com.yahoo.cloud.config.filedistribution.FiledistributorrpcConfig; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.config.FileReference; import com.yahoo.jrt.*; + +import java.time.Duration; import java.util.logging.Level; import java.util.logging.Logger; @@ -56,7 +58,7 @@ class FileAcquirerImpl implements FileAcquirer { 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()) { logWarning(); target.close(); diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/Timer.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/Timer.java index b1ef519d901..e8c08edb621 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/Timer.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/Timer.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.filedistribution.fileacquirer; +import java.time.Duration; import java.util.concurrent.TimeUnit; /** @@ -10,16 +11,16 @@ import java.util.concurrent.TimeUnit; class Timer { private final long endTime; - private long timeLeft() { - return endTime - System.currentTimeMillis(); + private Duration timeLeft() { + return Duration.ofNanos(endTime - System.nanoTime()); } public Timer(long timeout, TimeUnit timeUnit) { - endTime = System.currentTimeMillis() + timeUnit.toMillis(timeout); + endTime = System.nanoTime() + timeUnit.toNanos(timeout); } public long timeLeft(TimeUnit timeUnit) { - long remaining = timeUnit.convert(timeLeft(), TimeUnit.MILLISECONDS); + long remaining = timeUnit.convert(timeLeft().toMillis(), TimeUnit.MILLISECONDS); if (remaining > 0) return remaining; @@ -28,6 +29,6 @@ class Timer { } public boolean isTimeLeft() { - return timeLeft() > 0; + return ! timeLeft().isNegative(); } } |