From 77e3ffdbcb23316197f4f34d860c340c64a77178 Mon Sep 17 00:00:00 2001 From: Lester Solbakken Date: Fri, 20 May 2022 15:07:57 +0200 Subject: Only donload url config on containers - not config server --- .../java/com/yahoo/vespa/config/ConfigPayloadApplier.java | 12 +++++++++--- .../main/java/com/yahoo/vespa/config/ConfigTransformer.java | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'config/src') 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 9cd9a7c0981..5c0e9539f4f 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java @@ -273,8 +273,14 @@ public class ConfigPayloadApplier { // Need to convert url into actual file if 'url' type is used } else if (isUrlField(builder, methodName)) { - UrlReference url = resolveUrl(Utf8.toString(value.asUtf8())); - invokeSetter(builder, methodName, url); + String url = Utf8.toString(value.asUtf8()); + if (url == null || url.length() == 0) { + invokeSetter(builder, methodName, ""); + } else { + UrlReference urlref = resolveUrl(Utf8.toString(value.asUtf8())); + invokeSetter(builder, methodName, urlref); + } + } else { Object object = getValueFromInspector(value); @@ -294,7 +300,7 @@ public class ConfigPayloadApplier { private UrlReference resolveUrl(String url) { if (urlDownloader == null) { - throw new RuntimeException("Resolving url field failed due to missing URL downloader."); + return new UrlReference(url); // assuming config server - just return the actual url. } 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/ConfigTransformer.java b/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java index 3d3a27da713..9ececb71c56 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java @@ -28,7 +28,7 @@ public class ConfigTransformer { private final Class clazz; private static volatile PathAcquirer pathAcquirer = new IdentityPathAcquirer(); - private static volatile UrlDownloader urlDownloader; + private static volatile UrlDownloader urlDownloader = null; /** * For internal use only * -- cgit v1.2.3