From 3578ae64641d6a3fb412d6ca1516e3cec0ac70e3 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Wed, 12 Jan 2022 14:46:54 +0000 Subject: Set defaults in config defs and ModelContext api to improve bucket merge performance on content nodes. These are the same defaults set for the feature flags in https://github.com/vespa-engine/vespa/pull/20759. --- .../shared_threading_service/shared_threading_service_test.cpp | 5 +++-- searchcore/src/vespa/searchcore/config/proton.def | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp b/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp index e90bfc8ae57..bede9f967a4 100644 --- a/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp +++ b/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp @@ -24,7 +24,7 @@ make_proton_config(double concurrency) builder.feeding.concurrency = concurrency; builder.feeding.sharedFieldWriterExecutor = ProtonConfig::Feeding::SharedFieldWriterExecutor::DOCUMENT_DB; - builder.indexing.tasklimit = 300; + builder.indexing.tasklimit = 255; return builder; } @@ -73,7 +73,8 @@ TEST_F(SharedThreadingServiceTest, field_writer_can_be_shared_across_all_documen setup(0.75, 8); EXPECT_TRUE(field_writer()); EXPECT_EQ(6, field_writer()->getNumExecutors()); - EXPECT_EQ(300, field_writer()->first_executor()->getTaskLimit()); + // This is rounded to the nearest power of 2 when using THROUGHPUT feed executor. + EXPECT_EQ(256, field_writer()->first_executor()->getTaskLimit()); } GTEST_MAIN_RUN_ALL_TESTS() diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index 62b9f6416af..34530afe9f9 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -130,7 +130,7 @@ indexing.threads int default=1 restart ## Option to specify what is most important during indexing. ## This is experimental and will most likely be temporary. -indexing.optimize enum {LATENCY, THROUGHPUT, ADAPTIVE} default=LATENCY restart +indexing.optimize enum {LATENCY, THROUGHPUT, ADAPTIVE} default=THROUGHPUT restart ## Maximum number of pending operations for each of the internal ## indexing threads. Only used when visibility delay is zero. @@ -517,7 +517,7 @@ feeding.shared_field_writer_executor enum {NONE, INDEX, INDEX_AND_ATTRIBUTE, DOC ## This limit is only considered when executing tasks for handling external feed operations. ## In that case the calling thread (persistence thread) is blocked until the master thread has capacity to handle more tasks. ## When this limit is set to 0 it is ignored. -feeding.master_task_limit int default = 0 +feeding.master_task_limit int default = 1000 ## Adjustment to resource limit when determining if maintenance jobs can run. ## -- cgit v1.2.3