aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-01-10 13:12:58 +0100
committerGitHub <noreply@github.com>2022-01-10 13:12:58 +0100
commitaa33b21ef40bd767f33e7b528135223e4e05705a (patch)
tree5c54e64be56a1fec642185e837f73942d36acf11 /config-model
parentca9e75d4d99120a051b40900b9b2838b705faaad (diff)
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.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java4
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 3cd7a4634f0..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
@@ -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.25;
+ private double diskBloatFactor = 0.2;
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 51badae2746..d6020a96818 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.25, defaultCfg.flush().memory().diskbloatfactor(), EPSILON);
- assertEquals(0.25, defaultCfg.flush().memory().each().diskbloatfactor(), EPSILON);
+ assertEquals(0.2, defaultCfg.flush().memory().diskbloatfactor(), EPSILON);
+ assertEquals(0.2, defaultCfg.flush().memory().each().diskbloatfactor(), EPSILON);
var controlledCfg = getProtonConfig(createCluster(new ContentClusterBuilder().getXml(),
new DeployState.Builder().properties(new TestProperties().diskBloatFactor(0.31))