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

Revert "HADOOP-14954. MetricsSystemImpl#init should increment refCount when already initialized. Contributed by John Zhuge."

Browse Source 
This reverts commit 14b3c2695b152285ed2919f2aa5a25e247c47871.
This commit is contained in:
John Zhuge 2017-10-23 15:29:12 -07:00
parent 0f2a69127a
commit c904d60c38
2 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,16 +140,6 @@ public MetricsSystemImpl() {
this(null);
}
@VisibleForTesting
boolean isMonitoring() {
return monitoring;
}
@VisibleForTesting
int getRefCount() {
return refCount;
}
/**
* Initialized the metrics system with a prefix.
* @param prefix the system will look for configs with the prefix
@ -157,12 +147,12 @@ int getRefCount() {
*/
@Override
public synchronized MetricsSystem init(String prefix) {
++refCount;
if (monitoring && !DefaultMetricsSystem.inMiniClusterMode()) {
LOG.warn(this.prefix +" metrics system already initialized!");
return this;
}
this.prefix = checkNotNull(prefix, "prefix");
++refCount;
if (monitoring) {
// in mini cluster mode
LOG.info(this.prefix +" metrics system started (again)");

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

@ -26,8 +26,6 @@
import javax.annotation.Nullable;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -561,50 +559,6 @@ public void testRegisterSourceJmxCacheTTL() {
ms.shutdown();
}
@Test
public void testInitShutdown() {
boolean oldMode = DefaultMetricsSystem.inMiniClusterMode();
try {
DefaultMetricsSystem.setMiniClusterMode(true);
runInitShutdownTests();
DefaultMetricsSystem.setMiniClusterMode(false);
runInitShutdownTests();
} finally {
DefaultMetricsSystem.setMiniClusterMode(oldMode);
}
}
private void runInitShutdownTests() {
MetricsSystemImpl ms = new MetricsSystemImpl();
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(false));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(0));
ms.init("TestMetricsSystem1");
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(true));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(1));
ms.shutdown();
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(false));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(0));
ms.init("TestMetricsSystem2");
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(true));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(1));
ms.init("TestMetricsSystem3");
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(true));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(2));
ms.shutdown();
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(true));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(1));
ms.shutdown();
Assert.assertThat(ms.isMonitoring(), CoreMatchers.is(false));
Assert.assertThat(ms.getRefCount(), CoreMatchers.is(0));
}
@Metrics(context="test")
private static class TestSource {
@Metric("C1 desc") MutableCounterLong c1;