From dabcdf026a8c794f4c8f7f6b9c2d0975ea77872a Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 27 Jan 2021 10:56:12 +0100 Subject: Revert "Revert "32m merge chunk size"" --- configdefinitions/src/vespa/stor-filestor.def | 2 +- flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 +- 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", -- cgit v1.2.3