diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-06-15 15:50:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-15 15:50:36 +0200 |
commit | a280e9586033270d8cada08bb90983cadfa9118a (patch) | |
tree | 8cbf03295d3836b2db6361ced31c4a44f545bb3f /configserver | |
parent | d1e1926fc68e3367eaf8991b8bef7975b2ac799d (diff) | |
parent | 12bfebf0f28f9fb8e2c427828e93aa9a50101066 (diff) |
Merge branch 'master' into balder/add-shared-string-repo-control
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index ba9bf7761bd..30116b7ee69 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -209,6 +209,7 @@ public class ModelContextImpl implements ModelContext { private final Architecture adminClusterArchitecture; private final boolean enableProxyProtocolMixedMode; private final boolean sharedStringRepoNoReclaim; + private final String logFileCompressionAlgorithm; public FeatureFlags(FlagSource source, ApplicationId appId, Version version) { this.defaultTermwiseLimit = flagValue(source, appId, version, Flags.DEFAULT_TERM_WISE_LIMIT); @@ -254,6 +255,7 @@ public class ModelContextImpl implements ModelContext { this.adminClusterArchitecture = Architecture.valueOf(flagValue(source, appId, version, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE)); this.enableProxyProtocolMixedMode = flagValue(source, appId, version, Flags.ENABLE_PROXY_PROTOCOL_MIXED_MODE); this.sharedStringRepoNoReclaim = flagValue(source, appId, version, Flags.SHARED_STRING_REPO_NO_RECLAIM); + this.logFileCompressionAlgorithm = flagValue(source, appId, version, Flags.LOG_FILE_COMPRESSION_ALGORITHM); } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } @@ -301,6 +303,13 @@ public class ModelContextImpl implements ModelContext { @Override public Architecture adminClusterArchitecture() { return adminClusterArchitecture; } @Override public boolean enableProxyProtocolMixedMode() { return enableProxyProtocolMixedMode; } @Override public boolean sharedStringRepoNoReclaim() { return sharedStringRepoNoReclaim; } + @Override public String logFileCompressionAlgorithm(String defVal) { + var fflag = this.logFileCompressionAlgorithm; + if (fflag != null && ! fflag.equals("")) { + return fflag; + } + return defVal; + } private static <V> V flagValue(FlagSource source, ApplicationId appId, Version vespaVersion, UnboundFlag<? extends V, ?, ?> flag) { return flag.bindTo(source) |