diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-07 16:13:40 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-08 12:50:07 +0200 |
commit | eab973deb3dddf18fd3b806e04313a469c30a77d (patch) | |
tree | 8eb389d52e598135583b4171b34f228d79f66946 /container-disc | |
parent | 025eae59e89a473dbff75b435df3dc4710b8a789 (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')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java | 14 | ||||
-rw-r--r-- | container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index 4d71ae913d7..fafadc33d43 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -4,7 +4,7 @@ package com.yahoo.container.jdisc.metric; import com.google.inject.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.jdisc.Metric; -import com.yahoo.jdisc.statistics.ActiveContainerStatistics; +import com.yahoo.jdisc.statistics.ActiveContainerMetrics; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -32,19 +32,19 @@ public class MetricUpdater extends AbstractComponent { private static final String OPEN_FILE_DESCRIPTORS = "jdisc.open_file_descriptors"; private final Metric metric; - private final ActiveContainerStatistics activeContainerStatistics; + private final ActiveContainerMetrics activeContainerMetrics; private final Timer timer = new Timer(); long freeMemory = -1; long totalMemory = -1; @Inject - public MetricUpdater(Metric metric, ActiveContainerStatistics activeContainerStatistics) { - this(metric, activeContainerStatistics, 10*1000); + public MetricUpdater(Metric metric, ActiveContainerMetrics activeContainerMetrics) { + this(metric, activeContainerMetrics, 10*1000); } - public MetricUpdater(Metric metric, ActiveContainerStatistics activeContainerStatistics, long delayMillis) { + public MetricUpdater(Metric metric, ActiveContainerMetrics activeContainerMetrics, long delayMillis) { this.metric = metric; - this.activeContainerStatistics = activeContainerStatistics; + this.activeContainerMetrics = activeContainerMetrics; timer.schedule(new UpdaterTask(), delayMillis, delayMillis); } @@ -72,7 +72,7 @@ public class MetricUpdater extends AbstractComponent { metric.set(TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(MEMORY_MAPPINGS_COUNT, count_mappings(), null); metric.set(OPEN_FILE_DESCRIPTORS, count_open_files(), null); - activeContainerStatistics.emitMetrics(metric); + activeContainerMetrics.emitMetrics(metric); } // Note: Linux-specific 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) { |