summaryrefslogtreecommitdiffstats
path: root/container-disc/src/test/java
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-06-07 16:13:40 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-06-08 12:50:07 +0200
commiteab973deb3dddf18fd3b806e04313a469c30a77d (patch)
tree8eb389d52e598135583b4171b34f228d79f66946 /container-disc/src/test/java
parent025eae59e89a473dbff75b435df3dc4710b8a789 (diff)
Use a single thread to monitor all deactivated ActiveContainers
Add new watchdog class to combine monitoring and reporting of stale ActiveContainer instances. Introduce a grace period to allow deactivated containers some time to die.
Diffstat (limited to 'container-disc/src/test/java')
-rw-r--r--container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
index 1b88b5217bc..1ab0f8c090f 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
@@ -3,7 +3,7 @@ package com.yahoo.container.jdisc.metric;
import com.yahoo.jdisc.Metric;
import com.yahoo.jdisc.application.MetricConsumer;
-import com.yahoo.jdisc.statistics.ActiveContainerStatistics;
+import com.yahoo.jdisc.statistics.ActiveContainerMetrics;
import org.junit.Test;
import org.mockito.Mockito;
@@ -17,7 +17,7 @@ public class MetricUpdaterTest {
MetricProvider provider = MetricProviders.newInstance(consumer);
Metric metric = provider.get();
- MetricUpdater updater = new MetricUpdater(metric, Mockito.mock(ActiveContainerStatistics.class), 10);
+ MetricUpdater updater = new MetricUpdater(metric, Mockito.mock(ActiveContainerMetrics.class), 10);
long start = System.currentTimeMillis();
boolean updated = false;
while (System.currentTimeMillis() - start < 60000 && !updated) {