From bd86b6411dd1b4928074432817c6a9ebfe9c123c Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Mon, 8 May 2023 11:57:06 +0000 Subject: Default-enable fast path updates when document versions are consistent This feature is always _implicitly_ enabled when 3-phase updates are enabled (which is the case by default). Flip the config default to true as well to be more in line with what's actually the case in production. --- storage/src/tests/distributor/distributor_stripe_test.cpp | 2 ++ storage/src/vespa/storage/config/stor-distributormanager.def | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'storage') diff --git a/storage/src/tests/distributor/distributor_stripe_test.cpp b/storage/src/tests/distributor/distributor_stripe_test.cpp index 2130c6ae62d..e963b505bc2 100644 --- a/storage/src/tests/distributor/distributor_stripe_test.cpp +++ b/storage/src/tests/distributor/distributor_stripe_test.cpp @@ -865,6 +865,8 @@ TEST_F(DistributorStripeTest, fast_path_on_consistent_gets_config_is_propagated_ { setup_stripe(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); + EXPECT_TRUE(getConfig().update_fast_path_restart_enabled()); // Enabled by default + configure_update_fast_path_restart_enabled(true); EXPECT_TRUE(getConfig().update_fast_path_restart_enabled()); diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def index fb0cd4f21d0..9d2a1ddf5c9 100644 --- a/storage/src/vespa/storage/config/stor-distributormanager.def +++ b/storage/src/vespa/storage/config/stor-distributormanager.def @@ -219,7 +219,7 @@ use_btree_database bool default=true restart ## content nodes, the two-phase update path reverts back to the regular fast path. ## Since all replicas of the document were in sync, applying the update in-place ## shall be considered safe. -restart_with_fast_update_path_if_all_get_timestamps_are_consistent bool default=false +restart_with_fast_update_path_if_all_get_timestamps_are_consistent bool default=true ## If set, no merge operations may be generated for any reason by a distributor. ## This is ONLY intended for system testing of certain transient edge cases and -- cgit v1.2.3 From 052d284ed4654cf5c87cb52ae985073b70d7bce5 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Mon, 8 May 2023 12:47:59 +0000 Subject: Add deprecation comment for config --- storage/src/vespa/storage/config/stor-distributormanager.def | 1 + 1 file changed, 1 insertion(+) (limited to 'storage') diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def index 9d2a1ddf5c9..9c8469f924c 100644 --- a/storage/src/vespa/storage/config/stor-distributormanager.def +++ b/storage/src/vespa/storage/config/stor-distributormanager.def @@ -219,6 +219,7 @@ use_btree_database bool default=true restart ## content nodes, the two-phase update path reverts back to the regular fast path. ## Since all replicas of the document were in sync, applying the update in-place ## shall be considered safe. +## DEPRECATED -- always enabled with 3-phase updates. restart_with_fast_update_path_if_all_get_timestamps_are_consistent bool default=true ## If set, no merge operations may be generated for any reason by a distributor. -- cgit v1.2.3