summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLester Solbakken <lesters@oath.com>2019-01-10 14:48:39 +0100
committerLester Solbakken <lesters@oath.com>2019-01-10 14:48:39 +0100
commitcea1129fdb95dc25cb2a2608af6d4751360da436 (patch)
tree0538cbadcc51a8706b76c6c758a939b955a6b709 /config
parent430783197c66bc93de41273afd5ca7517d998748 (diff)
Increase timeout for url download to 1 hour
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java2
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
index dee9e503f46..40d79afc854 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
@@ -293,7 +293,7 @@ public class ConfigPayloadApplier<T extends ConfigInstance.Builder> {
if (urlDownloader == null || !urlDownloader.isValid()) {
throw new RuntimeException("Resolving url field failed due to missing or invalid URL downloader.");
}
- File file = urlDownloader.waitFor(new UrlReference(url), 10 * 60);
+ File file = urlDownloader.waitFor(new UrlReference(url), 60 * 60);
return new UrlReference(file.getAbsolutePath());
}
diff --git a/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java b/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java
index c2bba83d633..61981e6edb2 100644
--- a/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java
+++ b/config/src/main/java/com/yahoo/vespa/config/UrlDownloader.java
@@ -71,7 +71,7 @@ public class UrlDownloader {
Request request = new Request("url.waitFor");
request.parameters().add(new StringValue(urlReference.value()));
- double rpcTimeout = Math.min(timeLeft, 5 * 60.0);
+ double rpcTimeout = Math.min(timeLeft, 60 * 60.0);
log.log(LogLevel.DEBUG, "InvokeSync waitFor " + urlReference + " with " + rpcTimeout + " seconds timeout");
target.invokeSync(request, rpcTimeout);