summaryrefslogtreecommitdiffstats
path: root/filedistribution
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-06-22 12:13:49 +0200
committerHarald Musum <musum@yahooinc.com>2022-06-22 12:19:00 +0200
commit6bfe0951defb2a6949fb8ca3ae9f0ee7a3655204 (patch)
tree71799b149152434b2bfe0888996659bfa51d3db6 /filedistribution
parent3177a9ad41e46632b03f9f5ccea4a42da52cabc4 (diff)
Make sure to return response when request times out
Return with new error code 2. Clients only check for error code 0, so a new error code is handled implicitly also by old clients
Diffstat (limited to 'filedistribution')
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java5
1 files changed, 3 insertions, 2 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 03448b5fa4a..0267feb9ffc 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -112,11 +112,12 @@ public class FileReferenceDownloader {
FileReference fileReference = fileReferenceDownload.fileReference();
if (validateResponse(request)) {
log.log(Level.FINE, () -> "Request callback, OK. Req: " + request + "\nSpec: " + connection);
- if (request.returnValues().get(0).asInt32() == 0) {
+ int errorCode = request.returnValues().get(0).asInt32();
+ if (errorCode == 0) {
log.log(Level.FINE, () -> "Found " + fileReference + " available at " + connection.getAddress());
return true;
} else {
- log.log(logLevel, fileReference + " not found at " + connection.getAddress());
+ log.log(logLevel, fileReference + " not found or timed out (error code " + errorCode + ") at " + connection.getAddress());
return false;
}
} else {