diff options
Diffstat (limited to 'config-proxy')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java | 21 |
1 files changed, 2 insertions, 19 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 3107f9029d8..9e6a54d8e2c 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,14 +6,6 @@ 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.stream.Collectors; - -import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType; -import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType.gzip; -import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType.lz4; -import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType.zstd; /** * Keeps track of file distribution and url download rpc servers. @@ -41,18 +33,9 @@ public class FileDistributionAndUrlDownload { private FileDownloader createDownloader(Supervisor supervisor, ConfigSourceSet source) { return new FileDownloader(new FileDistributionConnectionPool(source, supervisor), supervisor, - Duration.ofMinutes(5), - acceptedCompressionTypes()); + Duration.ofMinutes(5)); } - private Set<CompressionType> acceptedCompressionTypes() { - Set<CompressionType> acceptedCompressionTypes = Set.of(gzip, lz4, zstd); - 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 acceptedCompressionTypes; - } + } |