summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-26 14:42:13 +0100
committerGitHub <noreply@github.com>2023-01-26 14:42:13 +0100
commitd25bb106ee6d4cf30efb1299297baa071503da54 (patch)
treef4bf030e66b554177957bb933a00c1df73df0bec
parent61efbb1851856be8b8569abd7fe27f3f44d6d3df (diff)
parentf00ae855e219fbf4857fdf41aef118dc867553d0 (diff)
Merge pull request #25749 from vespa-engine/hmusum/accept-all-compression-types-by-default
Accept all compression types by default
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java5
1 files changed, 4 insertions, 1 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 8f7aae17e84..3107f9029d8 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
@@ -11,6 +11,9 @@ 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.
@@ -43,7 +46,7 @@ public class FileDistributionAndUrlDownload {
}
private Set<CompressionType> acceptedCompressionTypes() {
- Set<CompressionType> acceptedCompressionTypes = Set.of(CompressionType.gzip);
+ 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(",");