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

YARN-2109. Fix TestRM to work with both schedulers. (Anubhav Dhoot via kasha) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605142 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-06-24 17:30:53 +00:00
parent b7e3c2eecd
commit c0991d11eb
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -181,6 +181,8 @@ Release 2.5.0 - UNRELEASED
YARN-2192. TestRMHA fails when run with a mix of Schedulers. YARN-2192. TestRMHA fails when run with a mix of Schedulers.
(Anubhav Dhoot via kasha) (Anubhav Dhoot via kasha)
YARN-2109. Fix TestRM to work with both schedulers. (Anubhav Dhoot via kasha)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

12
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
View File

@ -28,6 +28,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -78,7 +81,14 @@ public class TestRM {
// Milliseconds to sleep for when waiting for something to happen // Milliseconds to sleep for when waiting for something to happen
private final static int WAIT_SLEEP_MS = 100; private final static int WAIT_SLEEP_MS = 100;
@After
public void tearDown() {
ClusterMetrics.destroy();
QueueMetrics.clearQueueMetrics();
DefaultMetricsSystem.shutdown();
}
@Test @Test
public void testGetNewAppId() throws Exception { public void testGetNewAppId() throws Exception {
Logger rootLogger = LogManager.getRootLogger(); Logger rootLogger = LogManager.getRootLogger();