diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-12 14:40:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 14:40:37 +0100 |
| commit | 2abd22d3f855d8ed12a8872e612df91492dd8a85 (patch) | |
| tree | 9dceb525a717eaa59b6373e61c79bb72bb7a4f74 /storage | |
| parent | e20fe7919184ee64083c92b3c376f577f3a3bd21 (diff) | |
| parent | 9eb9e4bcf44db7c0a1830989b1ad089d26d77914 (diff) | |
Merge pull request #25534 from vespa-engine/balder/switch-default-gc-two-phase
Two phase GC is now default
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/distributor/distributor_stripe_test.cpp | 3 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/stor-distributormanager.def | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/storage/src/tests/distributor/distributor_stripe_test.cpp b/storage/src/tests/distributor/distributor_stripe_test.cpp index 91b43ebce16..73ff0f22614 100644 --- a/storage/src/tests/distributor/distributor_stripe_test.cpp +++ b/storage/src/tests/distributor/distributor_stripe_test.cpp @@ -1022,8 +1022,7 @@ TEST_F(DistributorStripeTest, enable_two_phase_gc_config_is_propagated_to_intern { setup_stripe(Redundancy(1), NodeCount(1), "distributor:1 storage:1"); - // Feature is currently disabled by default. TODO change once we roll it out. - EXPECT_FALSE(getConfig().enable_two_phase_garbage_collection()); + EXPECT_TRUE(getConfig().enable_two_phase_garbage_collection()); configure_enable_two_phase_garbage_collection(true); EXPECT_TRUE(getConfig().enable_two_phase_garbage_collection()); diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def index 9ecd39cdd01..17ab56f69de 100644 --- a/storage/src/vespa/storage/config/stor-distributormanager.def +++ b/storage/src/vespa/storage/config/stor-distributormanager.def @@ -306,4 +306,4 @@ inhibit_default_merges_when_global_merges_pending bool default=true ## concurrent feed ops to GC'd documents from potentially creating inconsistencies. ## Two-phase GC is only used iff all replica content nodes support the feature AND it's enabled ## by this config. -enable_two_phase_garbage_collection bool default=false +enable_two_phase_garbage_collection bool default=true |