You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wh...@apache.org on 2014/04/08 10:21:03 UTC
svn commit: r1585660 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./
src/main/java/org/apache/hadoop/metrics2/impl/
src/test/java/org/apache/hadoop/metrics2/impl/
Author: wheat9
Date: Tue Apr 8 08:21:03 2014
New Revision: 1585660
URL: http://svn.apache.org/r1585660
Log:
HADOOP-10468. Merge r1585659 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1585660&r1=1585659&r2=1585660&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Apr 8 08:21:03 2014
@@ -42,6 +42,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10462. DF#getFilesystem is not parsing the command output.
(Akira AJISAKA via umamahesh)
+ HADOOP-10468. TestMetricsSystemImpl.testMultiThreadedPublish fails
+ intermediately. (wheat9)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java?rev=1585660&r1=1585659&r2=1585660&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java Tue Apr 8 08:21:03 2014
@@ -85,7 +85,7 @@ class MetricsConfig extends SubsetConfig
private ClassLoader pluginLoader;
MetricsConfig(Configuration c, String prefix) {
- super(c, prefix.toLowerCase(Locale.US), ".");
+ super(c, prefix, ".");
}
static MetricsConfig create(String prefix) {
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java?rev=1585660&r1=1585659&r2=1585660&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java Tue Apr 8 08:21:03 2014
@@ -60,11 +60,12 @@ public class TestGangliaMetrics {
@Test
public void testTagsForPrefix() throws Exception {
ConfigBuilder cb = new ConfigBuilder()
- .add("test.sink.ganglia.tagsForPrefix.all", "*")
- .add("test.sink.ganglia.tagsForPrefix.some", "NumActiveSinks, NumActiveSources")
- .add("test.sink.ganglia.tagsForPrefix.none", "");
+ .add("Test.sink.ganglia.tagsForPrefix.all", "*")
+ .add("Test.sink.ganglia.tagsForPrefix.some", "NumActiveSinks, " +
+ "NumActiveSources")
+ .add("Test.sink.ganglia.tagsForPrefix.none", "");
GangliaSink30 sink = new GangliaSink30();
- sink.init(cb.subset("test.sink.ganglia"));
+ sink.init(cb.subset("Test.sink.ganglia"));
List<MetricsTag> tags = new ArrayList<MetricsTag>();
tags.add(new MetricsTag(MsInfo.Context, "all"));
@@ -97,8 +98,8 @@ public class TestGangliaMetrics {
@Test public void testGangliaMetrics2() throws Exception {
ConfigBuilder cb = new ConfigBuilder().add("default.period", 10)
- .add("test.sink.gsink30.context", "test") // filter out only "test"
- .add("test.sink.gsink31.context", "test") // filter out only "test"
+ .add("Test.sink.gsink30.context", "test") // filter out only "test"
+ .add("Test.sink.gsink31.context", "test") // filter out only "test"
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test"));
MetricsSystemImpl ms = new MetricsSystemImpl("Test");
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java?rev=1585660&r1=1585659&r2=1585660&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java Tue Apr 8 08:21:03 2014
@@ -88,11 +88,11 @@ public class TestMetricsSystemImpl {
DefaultMetricsSystem.shutdown();
new ConfigBuilder().add("*.period", 8)
//.add("test.sink.plugin.urls", getPluginUrlsAsString())
- .add("test.sink.test.class", TestSink.class.getName())
- .add("test.*.source.filter.exclude", "s0")
- .add("test.source.s1.metric.filter.exclude", "X*")
- .add("test.sink.sink1.metric.filter.exclude", "Y*")
- .add("test.sink.sink2.metric.filter.exclude", "Y*")
+ .add("Test.sink.test.class", TestSink.class.getName())
+ .add("Test.*.source.filter.exclude", "s0")
+ .add("Test.source.s1.metric.filter.exclude", "X*")
+ .add("Test.sink.sink1.metric.filter.exclude", "Y*")
+ .add("Test.sink.sink2.metric.filter.exclude", "Y*")
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test"));
MetricsSystemImpl ms = new MetricsSystemImpl("Test");
ms.start();
@@ -130,11 +130,11 @@ public class TestMetricsSystemImpl {
DefaultMetricsSystem.shutdown();
new ConfigBuilder().add("*.period", 8)
//.add("test.sink.plugin.urls", getPluginUrlsAsString())
- .add("test.sink.test.class", TestSink.class.getName())
- .add("test.*.source.filter.exclude", "s0")
- .add("test.source.s1.metric.filter.exclude", "X*")
- .add("test.sink.sink1.metric.filter.exclude", "Y*")
- .add("test.sink.sink2.metric.filter.exclude", "Y*")
+ .add("Test.sink.test.class", TestSink.class.getName())
+ .add("Test.*.source.filter.exclude", "s0")
+ .add("Test.source.s1.metric.filter.exclude", "X*")
+ .add("Test.sink.sink1.metric.filter.exclude", "Y*")
+ .add("Test.sink.sink2.metric.filter.exclude", "Y*")
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test"));
MetricsSystemImpl ms = new MetricsSystemImpl("Test");
ms.start();
@@ -167,12 +167,13 @@ public class TestMetricsSystemImpl {
}
@Test public void testMultiThreadedPublish() throws Exception {
+ final int numThreads = 10;
new ConfigBuilder().add("*.period", 80)
- .add("test.sink.Collector.queue.capacity", "20")
+ .add("Test.sink.Collector." + MetricsConfig.QUEUE_CAPACITY_KEY,
+ numThreads)
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test"));
final MetricsSystemImpl ms = new MetricsSystemImpl("Test");
ms.start();
- final int numThreads = 10;
final CollectingSink sink = new CollectingSink(numThreads);
ms.registerSink("Collector",
"Collector of values from all threads.", sink);
@@ -279,10 +280,10 @@ public class TestMetricsSystemImpl {
@Test public void testHangingSink() {
new ConfigBuilder().add("*.period", 8)
- .add("test.sink.test.class", TestSink.class.getName())
- .add("test.sink.hanging.retry.delay", "1")
- .add("test.sink.hanging.retry.backoff", "1.01")
- .add("test.sink.hanging.retry.count", "0")
+ .add("Test.sink.test.class", TestSink.class.getName())
+ .add("Test.sink.hanging.retry.delay", "1")
+ .add("Test.sink.hanging.retry.backoff", "1.01")
+ .add("Test.sink.hanging.retry.count", "0")
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test"));
MetricsSystemImpl ms = new MetricsSystemImpl("Test");
ms.start();