diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/distributor/distributor_stripe_test.cpp | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/stor-distributormanager.def | 3 |
2 files changed, 4 insertions, 1 deletions
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..9c8469f924c 100644 --- a/storage/src/vespa/storage/config/stor-distributormanager.def +++ b/storage/src/vespa/storage/config/stor-distributormanager.def @@ -219,7 +219,8 @@ 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 +## 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. ## This is ONLY intended for system testing of certain transient edge cases and |