Make bucket executor default.

2 files changed, 12 insertions, 12 deletions

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 24da45a231b..a88d6515fcc 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -138,8 +138,8 @@ public class Flags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundIntFlag MAX_PENDING_MOVE_OPS = defineIntFlag(
-            "max-pending-move-ops", 10,
-            List.of("baldersheim"), "2021-02-15", "2021-05-01",
+            "max-pending-move-ops", 100,
+            List.of("baldersheim"), "2021-02-15", "2021-06-01",
             "Max number of move operations inflight",
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
@@ -152,15 +152,15 @@ public class Flags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundBooleanFlag USE_BUCKET_EXECUTOR_FOR_LID_SPACE_COMPACT = defineFeatureFlag(
-            "use-bucket-executor-for-lid-space-compact", false,
-            List.of("baldersheim"), "2021-01-24", "2021-05-01",
+            "use-bucket-executor-for-lid-space-compact", true,
+            List.of("baldersheim"), "2021-01-24", "2021-06-01",
             "Wheter to use content-level bucket executor or legacy frozen buckets",
             "Takes effect on next internal redeployment",
             APPLICATION_ID);
 
     public static final UnboundBooleanFlag USE_BUCKET_EXECUTOR_FOR_BUCKET_MOVE = defineFeatureFlag(
-            "use-bucket-executor-for-bucket-move", false,
-            List.of("baldersheim"), "2021-02-15", "2021-05-01",
+            "use-bucket-executor-for-bucket-move", true,
+            List.of("baldersheim"), "2021-02-15", "2021-06-01",
             "Wheter to use content-level bucket executor or legacy frozen buckets",
             "Takes effect on next internal redeployment",
             APPLICATION_ID);
@@ -180,8 +180,8 @@ public class Flags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundDoubleFlag MAX_DEAD_BYTES_RATIO = defineDoubleFlag(
-            "max-dead-bytes-ratio", 0.15,
-            List.of("baldersheim", "geirst","toregge"), "2021-02-03", "2021-05-01",
+            "max-dead-bytes-ratio", 0.05,
+            List.of("baldersheim", "geirst","toregge"), "2021-02-03", "2021-06-01",
             "max ratio of dead to used memory bytes in large data structures before compaction is attempted",
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index ec7752368e9..050930352b7 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -319,7 +319,7 @@ documentdb[].allocation.amortizecount int default=10000
 documentdb[].allocation.multivaluegrowfactor double default=0.2
 
 ## The ratio of used bytes that can be dead before attempting to perform compaction.
-documentdb[].allocation.max_dead_bytes_ratio double default=0.15
+documentdb[].allocation.max_dead_bytes_ratio double default=0.05
 
 ## The ratio of used address space that can be dead before attempting to perform compaction.
 documentdb[].allocation.max_dead_address_space_ratio double default=0.2
@@ -413,13 +413,13 @@ lidspacecompaction.removebatchblockrate double default=0.5
 lidspacecompaction.removeblockrate double default=100.0
 
 ## Set to true to enable bucket locking via content layer
-lidspacecompaction.usebucketexecutor bool default=false
+lidspacecompaction.usebucketexecutor bool default=true
 
 ## Maximum docs to move in single operation per bucket
 bucketmove.maxdocstomoveperbucket int default=1
 
 ## Set to true to enable bucket locking via content layer
-bucketmove.usebucketexecutor bool default=false
+bucketmove.usebucketexecutor bool default=true
 
 ## This is the maximum value visibilitydelay you can have.
 ## A to higher value here will cost more memory while not improving too much.
@@ -515,7 +515,7 @@ maintenancejobs.resourcelimitfactor double default = 1.05
 ##
 ## The job is unblocked (and executed again) when this goes under the limit again.
 ## Currently used by 'lid_space_compaction' job.
-maintenancejobs.maxoutstandingmoveops int default=10
+maintenancejobs.maxoutstandingmoveops int default=100
 
 ## Controls the type of bucket checksum used. Do not change unless 
 ## in depth understanding is present.