diff options
author | Harald Musum <musum@yahooinc.com> | 2022-07-06 10:33:57 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-07-06 10:33:57 +0200 |
commit | f7d93a0f3bade34a4a02cdbd8d3942422ed65b2f (patch) | |
tree | a82b30d72ca49a93bf81facd7943dab9ebe3ed8e /config-proxy | |
parent | 8dae227258dde84db5116922fbc616dc1d70d3a7 (diff) |
Wire in use of compression types and flags for file distribution
VESPA_FILE_DISTRIBUTION_ACCEPTED_COMPRESSION_TYPES is not set anywhere
yet, will be set through host-admin
Diffstat (limited to 'config-proxy')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java | 15 |
1 files changed, 13 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 68570722117..edd16c3d23d 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 @@ -6,11 +6,15 @@ import com.yahoo.config.subscription.ConfigSourceSet; import com.yahoo.jrt.Supervisor; import com.yahoo.vespa.filedistribution.FileDistributionConnectionPool; import com.yahoo.vespa.filedistribution.FileDownloader; - import java.time.Duration; +import java.util.Arrays; +import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType; /** * Keeps track of file distribution and url download rpc servers. @@ -45,9 +49,16 @@ public class FileDistributionAndUrlDownload { } private FileDownloader createDownloader(Supervisor supervisor, ConfigSourceSet source) { + Set<CompressionType> acceptedCompressionTypes = Set.of(CompressionType.gzip); + String env = System.getenv("VESPA_FILE_DISTRIBUTION_ACCEPTED_COMPRESSION_TYPES"); + if (env != null && ! env.isEmpty()) { + String[] types = env.split(","); + acceptedCompressionTypes = Arrays.stream(types).map(CompressionType::valueOf).collect(Collectors.toSet()); + } return new FileDownloader(new FileDistributionConnectionPool(source, supervisor), supervisor, - Duration.ofMinutes(5)); + Duration.ofMinutes(5), + acceptedCompressionTypes); } } |