Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong time unit parameter. (zxu via rkanter) 

(cherry picked from commit 764f8baa99)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
This commit is contained in:
Robert Kanter 2015-09-11 15:21:22 -07:00 committed by Tsuyoshi Ozawa
parent 2b7e6f7dfd
commit d833950317
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -28,6 +28,9 @@ Release 2.7.3 - UNRELEASED
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
(Brahma Reddy Battula via ozawa)
HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong
time unit parameter. (zxu via rkanter)
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
View File

@ -61,7 +61,7 @@ class MetricsSourceAdapter implements DynamicMBean {
private Iterable<MetricsRecordImpl> lastRecs;
private long jmxCacheTS = 0;
private int jmxCacheTTL;
private long jmxCacheTTL;
private MBeanInfo infoCache;
private ObjectName mbeanName;
private final boolean startMBeans;
@ -69,7 +69,7 @@ class MetricsSourceAdapter implements DynamicMBean {
MetricsSourceAdapter(String prefix, String name, String description,
MetricsSource source, Iterable<MetricsTag> injectedTags,
MetricsFilter recordFilter, MetricsFilter metricFilter,
int jmxCacheTTL, boolean startMBeans) {
long jmxCacheTTL, boolean startMBeans) {
this.prefix = checkNotNull(prefix, "prefix");
this.name = checkNotNull(name, "name");
this.source = checkNotNull(source, "source");
@ -84,7 +84,7 @@ class MetricsSourceAdapter implements DynamicMBean {
MetricsSourceAdapter(String prefix, String name, String description,
MetricsSource source, Iterable<MetricsTag> injectedTags,
int period, MetricsConfig conf) {
long period, MetricsConfig conf) {
this(prefix, name, description, source, injectedTags,
conf.getFilter(RECORD_FILTER_KEY),
conf.getFilter(METRIC_FILTER_KEY),
@ -230,7 +230,11 @@ class MetricsSourceAdapter implements DynamicMBean {
return mbeanName;
}
@VisibleForTesting
long getJmxCacheTTL() {
return jmxCacheTTL;
}
private void updateInfoCache() {
LOG.debug("Updating info cache...");
infoCache = infoBuilder.reset(lastRecs).get();

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
View File

@ -261,11 +261,9 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
void registerSource(String name, String desc, MetricsSource source) {
checkNotNull(config, "config");
MetricsConfig conf = sourceConfigs.get(name);
MetricsSourceAdapter sa = conf != null
? new MetricsSourceAdapter(prefix, name, desc, source,
injectedTags, period, conf)
: new MetricsSourceAdapter(prefix, name, desc, source,
injectedTags, period, config.subset(SOURCE_KEY));
MetricsSourceAdapter sa = new MetricsSourceAdapter(prefix, name, desc,
source, injectedTags, period * 1000L, conf != null ? conf
: config.subset(SOURCE_KEY));
sources.put(name, sa);
sa.start();
LOG.debug("Registered source "+ name);
@ -362,7 +360,7 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
return;
}
logicalTime = 0;
long millis = period * 1000;
long millis = period * 1000L;
timer = new Timer("Timer for '"+ prefix +"' metrics system", true);
timer.scheduleAtFixedRate(new TimerTask() {
public void run() {
@ -556,7 +554,7 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
private void registerSystemSource() {
MetricsConfig sysConf = sourceConfigs.get(MS_NAME);
sysSource = new MetricsSourceAdapter(prefix, MS_STATS_NAME, MS_STATS_DESC,
MetricsAnnotations.makeSource(this), injectedTags, period,
MetricsAnnotations.makeSource(this), injectedTags, period * 1000L,
sysConf == null ? config.subset(SOURCE_KEY) : sysConf);
sysSource.start();
}

13
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
View File

@ -544,6 +544,19 @@ public class TestMetricsSystemImpl {
}
}
@Test
public void testRegisterSourceJmxCacheTTL() {
MetricsSystem ms = new MetricsSystemImpl();
ms.init("TestMetricsSystem");
TestSource ts = new TestSource("ts");
ms.register(ts);
MetricsSourceAdapter sa = ((MetricsSystemImpl) ms)
.getSourceAdapter("TestSource");
assertEquals(MetricsConfig.PERIOD_DEFAULT * 1000 + 1,
sa.getJmxCacheTTL());
ms.shutdown();
}
@Metrics(context="test")
private static class TestSource {
@Metric("C1 desc") MutableCounterLong c1;