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

HADOOP-9946. NumAllSinks metrics shows lower value than NumActiveSinks (#5002) 

Reviewed-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Ashutosh Gupta 2022-10-25 10:22:25 +01:00 committed by GitHub
parent e6edbf1b4b
commit 0a26d84df1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,6 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
} }
return sink; return sink;
} }
allSinks.put(name, sink);
if (config != null) { if (config != null) {
registerSink(name, description, sink); registerSink(name, description, sink);
} }
@ -301,6 +300,7 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
? newSink(name, desc, sink, conf) ? newSink(name, desc, sink, conf)
: newSink(name, desc, sink, config.subset(SINK_KEY)); : newSink(name, desc, sink, config.subset(SINK_KEY));
sinks.put(name, sa); sinks.put(name, sa);
allSinks.put(name, sink);
sa.start(); sa.start();
LOG.info("Registered sink "+ name); LOG.info("Registered sink "+ name);
} }
@ -508,6 +508,7 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
conf.getString(DESC_KEY, sinkName), conf); conf.getString(DESC_KEY, sinkName), conf);
sa.start(); sa.start();
sinks.put(sinkName, sa); sinks.put(sinkName, sa);
allSinks.put(sinkName, sa.sink());
} catch (Exception e) { } catch (Exception e) {
LOG.warn("Error creating sink '"+ sinkName +"'", e); LOG.warn("Error creating sink '"+ sinkName +"'", e);
} }

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

@ -438,6 +438,8 @@ public class TestMetricsSystemImpl {
r = recs.get(1); r = recs.get(1);
assertTrue("NumActiveSinks should be 3", Iterables.contains(r.metrics(), assertTrue("NumActiveSinks should be 3", Iterables.contains(r.metrics(),
new MetricGaugeInt(MsInfo.NumActiveSinks, 3))); new MetricGaugeInt(MsInfo.NumActiveSinks, 3)));
assertTrue("NumAllSinks should be 3",
Iterables.contains(r.metrics(), new MetricGaugeInt(MsInfo.NumAllSinks, 3)));
} }
@Test @Test