diff options
| author | Harald Musum <musum@verizonmedia.com> | 2023-01-17 14:25:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 14:25:12 +0100 |
| commit | 1acb252f4cfbb6a700da281aeeeff5e68575bb55 (patch) | |
| tree | 43a977eddcb5048cd904e20cfccdffb823148c96 /vespa-feed-client | |
| parent | 60153b60949828b7ae7a29d2f638396b9e2b7494 (diff) | |
| parent | fe555db5e232629c1bb63155007a3e83c2ed85aa (diff) | |
Merge pull request #25602 from vespa-engine/balder/simplify-35
Balder/simplify 35
Diffstat (limited to 'vespa-feed-client')
| -rw-r--r-- | vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java index 19f3ccf7a83..593d93ffe20 100644 --- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java +++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/ApacheCluster.java @@ -105,7 +105,10 @@ class ApacheCluster implements Cluster { @Override public void cancelled() { vessel.cancel(false); } }); long timeoutMillis = wrapped.timeout() == null ? 200_000 : wrapped.timeout().toMillis() * 11 / 10 + 1_000; - Future<?> cancellation = timeoutExecutor.schedule(() -> { future.cancel(true); vessel.cancel(true); }, timeoutMillis, TimeUnit.MILLISECONDS); + Future<?> cancellation = timeoutExecutor.schedule(() -> { + future.cancel(true); + vessel.cancel(true); + }, timeoutMillis, TimeUnit.MILLISECONDS); vessel.whenComplete((__, ___) -> cancellation.cancel(true)); } catch (Throwable thrown) { |