diff options
| -rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java | 4 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java index f5a92b7bdca..3e7f7418ce2 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java @@ -53,9 +53,9 @@ public class FileDistributionAndUrlDownload { } private static ConnectionPool createConnectionPool(Supervisor supervisor, ConfigSourceSet source) { - String useFileDistributionConnectionPool = System.getenv("VESPA_USE_FILE_DISTRIBUTION_CONNECTION_POOL"); + String useFileDistributionConnectionPool = System.getenv("VESPA_CONFIG_PROXY_USE_FILE_DISTRIBUTION_CONNECTION_POOL"); // TODO: Lower log level or remove when verified - log.log(INFO, "VESPA_USE_FILE_DISTRIBUTION_CONNECTION_POOL: " + useFileDistributionConnectionPool); + log.log(INFO, "VESPA_CONFIG_PROXY_USE_FILE_DISTRIBUTION_CONNECTION_POOL: " + useFileDistributionConnectionPool); if (useFileDistributionConnectionPool != null && useFileDistributionConnectionPool.equalsIgnoreCase("true")) return new FileDistributionConnectionPool(source, supervisor); else diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 22374cb5b50..89a97f3e17d 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -384,6 +384,13 @@ public class Flags { "Takes effect on config server restart", ZONE_ID); + public static final UnboundBooleanFlag CONFIG_PROXY_USE_FILE_DISTRIBUTION_CONNECTION_POOL = defineFeatureFlag( + "config-proxy-use-file-distribution-connection-pool", false, + List.of("hmusum"), "2021-11-25", "2021-12-25", + "Whether to use FileDistributionConnectionPool instead of JRTConnectionPool for file downloads in config proxy", + "Takes effect on container reboot", + ZONE_ID, APPLICATION_ID); + public static final UnboundBooleanFlag USE_V8_GEO_POSITIONS = defineFeatureFlag( "use-v8-geo-positions", false, List.of("arnej"), "2021-11-15", "2022-12-31", |