diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2024-04-20 14:19:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 14:19:15 +0200 |
| commit | 3fe44a3631f073123679cfc30271fe04065eac23 (patch) | |
| tree | 7b2c164db946738c45a3a5b67b3830e91a79d917 | |
| parent | 7b00b21b41f0ff5aa5b110bbfd844aa9f31260cf (diff) | |
| parent | 31c062d3a0754e3961e791eca09018c44308b531 (diff) | |
Merge pull request #30977 from vespa-engine/freva/perf
Avoid starting quest db for /nodes/v2 unit tests
2 files changed, 7 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java index 940109bab8a..8b2dc44669f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.provision.autoscale; import com.yahoo.collections.Pair; +import com.yahoo.component.annotation.Inject; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; @@ -33,6 +34,11 @@ public class MemoryMetricsDb implements MetricsDb { /** Lock all access for now since we modify lists inside a map */ private final Object lock = new Object(); + @Inject + public MemoryMetricsDb() { + this(Clock.systemUTC()); + } + public MemoryMetricsDb(Clock clock) { this.clock = clock; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java index f653416d973..81a490939d6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java @@ -27,6 +27,7 @@ public class ContainerConfig { <accesslog type='disabled'/> <component id='com.yahoo.test.ManualClock'/> <component id='com.yahoo.vespa.curator.mock.MockCurator'/> + <component id='com.yahoo.vespa.hosted.provision.autoscale.MemoryMetricsDb'/> <component id='com.yahoo.vespa.hosted.provision.testutils.OrchestratorMock'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockDeployer'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockInfraDeployer'/> @@ -34,7 +35,6 @@ public class ContainerConfig { <component id='com.yahoo.vespa.hosted.provision.testutils.ServiceMonitorStub'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockDuperModel'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/> - <component id='com.yahoo.vespa.hosted.provision.autoscale.QuestMetricsDb'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockMetricsFetcher'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeRepository'/> <component id='com.yahoo.vespa.hosted.provision.testutils.MockProvisionServiceProvider'/> |