diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-10 10:10:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-10 10:10:40 +0100 |
commit | 9b00fdf0246ffff8a0dff05f2237738fe8fcafbf (patch) | |
tree | eb5e325cdb7da9527cff4a13e569271e9e1d47b4 | |
parent | d196326a38205db71e4107b0147d15303d3d208a (diff) | |
parent | 40f02c9c7c5d97301c6a7fbaf8c96871f5fb95be (diff) |
Merge pull request #20719 from vespa-engine/balder/tls-size-is-now-4-percent-by-default
Reduce default TLS size from 7% to 4%
4 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index e645fec5520..c4be4cbcd38 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -77,7 +77,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private List<String> zoneDnsSuffixes = List.of(); private int maxCompactBuffers = 1; private boolean failDeploymentWithInvalidJvmOptions = false; - private double tlsSizeFraction = 0.07; + private double tlsSizeFraction = 0.04; @Override public ModelContext.FeatureFlags featureFlags() { return this; } @Override public boolean multitenant() { return multitenant; } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index 191f7f5652a..4c0c5ebc5b3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -1062,7 +1062,7 @@ public class ContentClusterTest extends ContentBaseTest { var flavor = new Flavor(new FlavorsConfig.Flavor(new FlavorsConfig.Flavor.Builder().name("test").minDiskAvailableGb(100))); assertEquals(21474836480L, resolveMaxTLSSize(OptionalDouble.empty(), Optional.empty())); assertEquals(21474836480L, resolveMaxTLSSize(OptionalDouble.of(0.02), Optional.empty())); - assertEquals(7516192768L, resolveMaxTLSSize(OptionalDouble.empty(), Optional.of(flavor))); + assertEquals(4294967296L, resolveMaxTLSSize(OptionalDouble.empty(), Optional.of(flavor))); assertEquals(2147483648L, resolveMaxTLSSize(OptionalDouble.of(0.02), Optional.of(flavor))); assertEquals(3221225472L, resolveMaxTLSSize(OptionalDouble.of(0.03), Optional.of(flavor))); } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 68fc916331e..def77a9c4d8 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -53,7 +53,7 @@ public class Flags { ZONE_ID, APPLICATION_ID); public static final UnboundDoubleFlag TLS_SIZE_FRACTION = defineDoubleFlag( - "tls-size-fraction", 0.07, + "tls-size-fraction", 0.04, List.of("baldersheim"), "2021-12-20", "2022-02-01", "Fraction of disk available for transaction log", "Takes effect at redeployment", diff --git a/security-utils/pom.xml b/security-utils/pom.xml index ac856dff6c3..5c4deecc437 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -96,7 +96,7 @@ <configuration> <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> + <Bundle-Version>7.0.0</Bundle-Version> <Export-Package>com.yahoo.security.*;version=1.0.0;-noimport:=true</Export-Package> <_nouses>true</_nouses> <!-- Don't include 'uses' directives for package exports --> <_fixupmessages>"Classes found in the wrong directory"</_fixupmessages> <!-- Hide warnings for bouncycastle multi-release jars --> |