diff options
author | Harald Musum <musum@yahooinc.com> | 2021-12-16 07:49:32 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-12-16 07:49:32 +0100 |
commit | 2c01db08ab6fad3860b49728e3cd409c3682fa8a (patch) | |
tree | 7554fabe323dcf0acb461037403951fa961fccf0 /filedistribution/src | |
parent | 08ce958004934a27fd6544600ffe2a8d6faa0a46 (diff) |
Reduce increase in rpc timeout for each retry
Diffstat (limited to 'filedistribution/src')
-rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java index 21a9833c3e0..03448b5fa4a 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java @@ -67,9 +67,9 @@ public class FileReferenceDownloader { return; retryCount++; - // There is no one connection that will always work for each file reference (each file reference might - // exist on just one config server, and which one could be different for each file reference), so we - // should get a new connection for every retry + // There might not be one connection that works for all file references (each file reference might + // exist on just one config server, and which one could be different for each file reference), so + // switch to a new connection for every retry connection = connectionPool.switchConnection(connection); } while (retryCount < 5 || Instant.now().isAfter(end)); @@ -120,9 +120,8 @@ public class FileReferenceDownloader { return false; } } else { - log.log(logLevel, "Downloading " + fileReference + " from " + connection.getAddress() + " failed: " + - request + ", error: " + request.errorCode() + "(" + request.errorMessage() + - "). Will switch config server for next request" + + log.log(logLevel, "Downloading " + fileReference + " from " + connection.getAddress() + " failed:" + + " error code " + request.errorCode() + " (" + request.errorMessage() + ")." + " (retry " + retryCount + ", rpc timeout " + rpcTimeout + ")"); return false; } @@ -136,7 +135,7 @@ public class FileReferenceDownloader { } private Duration rpcTimeout(int retryCount) { - return Duration.ofSeconds(rpcTimeout.getSeconds()).plus(Duration.ofSeconds(retryCount * 10L)); + return Duration.ofSeconds(rpcTimeout.getSeconds()).plus(Duration.ofSeconds(retryCount * 5L)); } private boolean validateResponse(Request request) { |