aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2021-11-26 11:57:29 +0100
committerHarald Musum <musum@yahooinc.com>2021-11-26 11:57:29 +0100
commit62a0e2da98791193959afbfda73f99e93f2a9d59 (patch)
treedc8724c4e78113fb23ce86ac1ca3ae3c3c3fb07e
parent514575491c501a17034118b1b0db1583f77f8fbe (diff)
Reduce timeout when downloading files
Reduce from 3 minutes to 30 seconds. Download will be retried on next run anyway.
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java3
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index 08c300220df..9cc475a56a0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -100,7 +100,8 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
? new FileDistributionConnectionPool(configSourceSet, supervisor)
: new JRTConnectionPool(configSourceSet, supervisor),
supervisor,
- downloadDirectory);
+ downloadDirectory,
+ Duration.ofSeconds(30));
}
@Override
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
index 56e0add5961..3674cba0d97 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -47,8 +47,8 @@ public class FileDownloader implements AutoCloseable {
this(connectionPool, supervisor, defaultDownloadDirectory, timeout, defaultSleepBetweenRetries);
}
- public FileDownloader(ConnectionPool connectionPool, Supervisor supervisor, File downloadDirectory) {
- this(connectionPool, supervisor, downloadDirectory, defaultTimeout, defaultSleepBetweenRetries);
+ public FileDownloader(ConnectionPool connectionPool, Supervisor supervisor, File downloadDirectory, Duration timeout) {
+ this(connectionPool, supervisor, downloadDirectory, timeout, defaultSleepBetweenRetries);
}
public FileDownloader(ConnectionPool connectionPool,