diff options
| author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-01-12 15:26:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 15:26:42 +0100 |
| commit | a97941068e2265908128ce966680fa008beb77b4 (patch) | |
| tree | e488daac1dc580399d51074b17d501fc9fec850b /config-model | |
| parent | e85739241cf09a8359be30442dd735581d0d4837 (diff) | |
| parent | da098f1ba94e81831482de43806d8fc480763c96 (diff) | |
Merge branch 'master' into yngveaasheim/use-enum-for-serverBytes-metrics
Diffstat (limited to 'config-model')
3 files changed, 6 insertions, 8 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/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index 60227faa558..6bbd1b7eef2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -117,11 +117,9 @@ public class VespaMetricSet { addMetric(metrics, "jdisc.http.requests", List.of("rate", "count")); - metrics.add(new Metric("handled.requests.count")); - metrics.add(new Metric("handled.latency.max")); - metrics.add(new Metric("handled.latency.sum")); - metrics.add(new Metric("handled.latency.count")); - + addMetric(metrics, ContainerMetrics.HANDLED_REQUESTS.count()); + addMetric(metrics, ContainerMetrics.HANDLED_LATENCY.baseName(), List.of("max", "sum", "count")); + metrics.add(new Metric("serverRejectedRequests.rate")); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.rejected_tasks. metrics.add(new Metric("serverRejectedRequests.count")); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.rejected_tasks. 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 |