diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2022-06-15 11:33:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 11:33:57 +0200 |
| commit | c493d28bfafb8cf7f785a138ff29f326e83889b2 (patch) | |
| tree | c93f73dcf63d8fe06fd725348e0ffc8532c25b89 /config-model | |
| parent | 2abf24a233b6ee6bdca07d93d64e61d3c65d8bf6 (diff) | |
| parent | 92e6cf7365aa33a8405aee20924b42010247bc4e (diff) | |
Merge pull request #23102 from vespa-engine/arnej/use-zstd=for-access-logs
common default compression type
Diffstat (limited to 'config-model')
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 2 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 2a392087428..4755f674f69 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -168,7 +168,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> this.zone = (deployState != null) ? deployState.zone() : Zone.defaultZone(); this.zooKeeperLocalhostAffinity = zooKeeperLocalhostAffinity; this.numAvailableProcessors = deployState.featureFlags().availableProcessors(); - this.compressionType = deployState.featureFlags().logFileCompressionAlgorithm(isHostedVespa ? "zstd" : "gzip"); + this.compressionType = deployState.featureFlags().logFileCompressionAlgorithm("zstd"); componentGroup = new ComponentGroup<>(this, "component"); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java index bd2627f29d0..3462fb8bcfc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java @@ -54,7 +54,7 @@ public class AccessLogBuilder { @Override protected AccessLogComponent doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element spec) { - String fallback = deployState.featureFlags().logFileCompressionAlgorithm(isHostedVespa ? "zstd" : "gzip"); + String fallback = deployState.featureFlags().logFileCompressionAlgorithm("zstd"); return new AccessLogComponent( accessLogType, compressionType(spec, fallback), |