diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2024-05-21 17:09:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-21 17:09:25 +0200 |
commit | ec16b9b22481abf0959720fdec8a67c74bdce475 (patch) | |
tree | 7895e6fee91d4c3728feb664c7ee4b3387eb5138 /vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java | |
parent | 3d65e159d42ff317ca52107960c19af1a431afd1 (diff) | |
parent | 19d3c4448090576bc37f611794c5ee5799cde9f5 (diff) |
Merge pull request #31266 from vespa-engine/revert-31228-jonmv/feed-retry-grace-periodv8.345.20
Revert "Retry requests within retry count limit OR grace period (default 10s)" MERGEOK
Diffstat (limited to 'vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java')
-rw-r--r-- | vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java index 18369f29f0b..df010a167f6 100644 --- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java +++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/JettyCluster.java @@ -45,7 +45,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -82,11 +81,8 @@ class JettyCluster implements Cluster { Endpoint endpoint = findLeastBusyEndpoint(endpoints); try { endpoint.inflight.incrementAndGet(); - long reqTimeoutMillis = req.timeLeft().toMillis(); - if (reqTimeoutMillis <= 0) { - vessel.completeExceptionally(new TimeoutException("operation timed out after '" + req.timeout() + "'")); - return; - } + long reqTimeoutMillis = req.timeout() != null + ? req.timeout().toMillis() * 11 / 10 + 1000 : IDLE_TIMEOUT.toMillis(); Request jettyReq = client.newRequest(URI.create(endpoint.uri + req.path())) .version(HttpVersion.HTTP_2) .method(HttpMethod.fromString(req.method())) |