diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-04 12:10:08 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-04 17:08:01 +0200 |
commit | 7ed06b86cf547d1cbb33878a224af7488b6ecb0e (patch) | |
tree | cbc0004c36be9b9c894301ba09b7f979cae60f2e | |
parent | 7d10db9d3fbb3d5c6e0604aceabfc28945d40d3a (diff) |
Simplify
-rw-r--r-- | vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java index 7536c44e68e..1764016bae6 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/IOThread.java @@ -19,7 +19,6 @@ import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Optional; import java.util.Random; @@ -595,12 +594,9 @@ public class IOThread implements Runnable, AutoCloseable { if (connection.lastPollTime() == null) return true; // Exponential (2^x) dropoff: - double unit = pollIntervalUS / 1000.0; - double x = ( clock.millis() - connection.connectionTime().plus(connectionTimeToLive).toEpochMilli() ) / unit; - double lastX = ( connection.lastPollTime().toEpochMilli() - connection.connectionTime().plus(connectionTimeToLive).toEpochMilli() ) / unit; - - double currentDelayDoublings = Math.log(lastX)/Math.log(2); - return (x - lastX) > Math.pow(2, currentDelayDoublings); + double connectionEndOfLife = connection.connectionTime().plus(connectionTimeToLive).toEpochMilli(); + double connectionLastPolled = connection.lastPollTime().toEpochMilli(); + return clock.millis() - connectionEndOfLife > 2 * (connectionLastPolled - connectionEndOfLife); } private Instant closingTime(GatewayConnection connection) { |