diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-01-10 14:14:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 14:14:09 +0100 |
| commit | 24e47f5e68aed5c983250dbfbe91d895acc3cb13 (patch) | |
| tree | c7cbed3b51fdb940cd1827921041842722c6bba2 /config-model | |
| parent | 097cffa708c8aea92caad2f66ad062a2cbf536ba (diff) | |
| parent | 7d0e4432d613e0d5a5e87a85459c8ca1130302ad (diff) | |
Merge pull request #20729 from vespa-engine/revert-20728-revert-20724-balder/default-disk-bloat-at-25-percent
Revert "Revert "Balder/default disk bloat at 25 percent""
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java | 4 |
2 files changed, 3 insertions, 3 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 c4be4cbcd38..3cd7a4634f0 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 @@ -70,7 +70,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private int distributorMergeBusyWait = 10; private int docstoreCompressionLevel = 9; private int maxUnCommittedMemory = 123456; - private double diskBloatFactor = 0.2; + private double diskBloatFactor = 0.25; private boolean distributorEnhancedMaintenanceScheduling = false; private boolean asyncApplyBucketDiff = false; private boolean unorderedMergeChaining = false; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java index d6020a96818..51badae2746 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java @@ -275,8 +275,8 @@ public class ContentSchemaClusterTest { @Test public void verifyControlOfDiskBloatFactor() throws Exception { var defaultCfg = getProtonConfig(createCluster(new ContentClusterBuilder().getXml())); - assertEquals(0.2, defaultCfg.flush().memory().diskbloatfactor(), EPSILON); - assertEquals(0.2, defaultCfg.flush().memory().each().diskbloatfactor(), EPSILON); + assertEquals(0.25, defaultCfg.flush().memory().diskbloatfactor(), EPSILON); + assertEquals(0.25, defaultCfg.flush().memory().each().diskbloatfactor(), EPSILON); var controlledCfg = getProtonConfig(createCluster(new ContentClusterBuilder().getXml(), new DeployState.Builder().properties(new TestProperties().diskBloatFactor(0.31)) |