Revert "Balder/default disk bloat at 25 percent"

5 files changed, 7 insertions, 7 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))
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 be245788ac1..def77a9c4d8 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -160,7 +160,7 @@ public class Flags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundDoubleFlag DISK_BLOAT_FACTOR = defineDoubleFlag(
-            "disk-bloat-factor", 0.25,
+            "disk-bloat-factor", 0.2,
             List.of("baldersheim"), "2021-10-08", "2022-02-01",
             "Amount of bloat allowed before compacting file",
             "Takes effect at redeployment",
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index 8a3550ac00b..7e99c1a19aa 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -54,7 +54,7 @@ flush.strategy enum {SIMPLE, MEMORY} default=MEMORY restart
 flush.memory.maxmemory long default=4294967296
 
 ## Maximum total disk bloat factor before forcing flush.
-flush.memory.diskbloatfactor double default=0.25
+flush.memory.diskbloatfactor double default=0.2
 
 ## Max disk usage (in bytes) for all transaction logs before running flush.
 ## In this case the oldest component is flushed such that transaction log can be pruned and disk freed.
@@ -65,7 +65,7 @@ flush.memory.maxtlssize long default=21474836480
 flush.memory.each.maxmemory long default=1073741824
 
 ## Maximum disk bloat factor per component before forcing flush.
-flush.memory.each.diskbloatfactor double default=0.25
+flush.memory.each.diskbloatfactor double default=0.2
 
 ## Age of unflushed content before forcing age prioritization.
 ## Unit is seconds with 31 hours being the default.
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 -->