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 /messagebus | |
parent | 43830a7f7975080dbc4c25804a2506ab102c7868 (diff) |
Add method to use Duration as timeout to make unit explicit, and avoid many magic conversions.
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java | 3 | ||||
-rwxr-xr-x | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java index 811d8a25459..b4fa7d8f887 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java @@ -32,6 +32,7 @@ import com.yahoo.messagebus.routing.RoutingNode; import java.io.PrintWriter; import java.io.StringWriter; +import java.time.Duration; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -240,7 +241,7 @@ public class RPCNetwork implements Network, MethodHandler { @Override public void send(Message msg, List<RoutingNode> recipients) { SendContext ctx = new SendContext(this, msg, recipients); - double timeout = ctx.msg.getTimeRemainingNow() / 1000.0; + Duration timeout = Duration.ofMillis(ctx.msg.getTimeRemainingNow()); for (RoutingNode recipient : ctx.recipients) { RPCServiceAddress address = (RPCServiceAddress)recipient.getServiceAddress(); address.getTarget().resolveVersion(timeout, ctx); diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java index 85f50051e34..d94fb8f3420 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java @@ -7,6 +7,8 @@ import com.yahoo.jrt.RequestWaiter; import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; + +import java.time.Duration; import java.util.logging.Level; import com.yahoo.text.Utf8Array; @@ -95,7 +97,7 @@ public class RPCTarget implements RequestWaiter { * @param timeout The timeout for the request in seconds. * @param handler The handler to be called once the version is available. */ - void resolveVersion(double timeout, VersionHandler handler) { + void resolveVersion(Duration timeout, VersionHandler handler) { boolean hasVersion = false; boolean shouldInvoke = false; boolean shouldLog = log.isLoggable(Level.FINE); |