summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-01-27 10:56:12 +0100
committerGitHub <noreply@github.com>2021-01-27 10:56:12 +0100
commitdabcdf026a8c794f4c8f7f6b9c2d0975ea77872a (patch)
treea4890bff495cf5048f1305db74b18bd07c3a1863
parent9cae94c78ec9c2cbf942055d10ab6a0bbd0780e7 (diff)
Revert "Revert "32m merge chunk size""
-rw-r--r--configdefinitions/src/vespa/stor-filestor.def2
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def
index b90d37314c5..eb858cfe65c 100644
--- a/configdefinitions/src/vespa/stor-filestor.def
+++ b/configdefinitions/src/vespa/stor-filestor.def
@@ -41,7 +41,7 @@ common_merge_chain_optimalization_minimum_size int default=64 restart
##
## Default is set to 4 MB.
## Note that this will gradually be increased to reach stor-distributormanager:splitsize which is currently at 32M
-bucket_merge_chunk_size int default=4190208 restart
+bucket_merge_chunk_size int default=33554432 restart
## When merging, it is possible to send more metadata than needed in order to
## let local nodes in merge decide which entries fits best to add this time
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 6389d1811fc..63dfcdef610 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -245,7 +245,7 @@ public class Flags {
ZONE_ID, APPLICATION_ID);
public static final UnboundIntFlag MERGE_CHUNK_SIZE = defineIntFlag(
- "merge-chunk-size", 0x400000,
+ "merge-chunk-size", 0x2000000,
List.of("baldersheim"), "2020-12-02", "2021-02-01",
"Size of baldersheim buffer in service layer",
"Takes effect at redeployment",