diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-12 13:21:50 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-12 13:34:20 +0100 |
| commit | 34d5038ebc00c964868818b0d3038e4297b8919e (patch) | |
| tree | bc67dc8b333dae3e34d2a53f651ce760e19e3412 /config-model | |
| parent | 9667e51302674c198421a010e66efb8de8990f35 (diff) | |
Two phase GC is now default
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index fba2f711111..25ca654fc63 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -70,7 +70,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private List<String> environmentVariables = List.of(); private boolean loadCodeAsHugePages = false; private boolean sharedStringRepoNoReclaim = false; - private boolean useTwoPhaseDocumentGc = false; + private boolean useTwoPhaseDocumentGc = true; private int mbus_java_num_targets = 1; private int mbus_java_events_before_wakeup = 1; private int mbus_cpp_num_targets = 1; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index c41840eaefa..96f5f9b9409 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -1154,8 +1154,8 @@ public class ContentClusterTest extends ContentBaseTest { // TODO change once gradual rollout complete @Test - public void two_phase_garbage_collection_config_is_disabled_by_default() { - assertFalse(resolveTwoPhaseGcConfigWithFeatureFlag(null)); + public void two_phase_garbage_collection_config_is_enabled_by_default() { + assertTrue(resolveTwoPhaseGcConfigWithFeatureFlag(null)); } @Test |