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

YARN-5050. Code cleanup for TestDistributedShell (Li Lu via sjlee)

This commit is contained in:
Sangjin Lee 2016-05-19 17:25:05 -07:00
parent 4a7011a45f
commit d5dfee24b1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
View File

@ -135,6 +135,8 @@ public class TestDistributedShell {
conf = new YarnConfiguration(); conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128); conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128);
// reduce the teardown waiting time
conf.setLong(YarnConfiguration.DISPATCHER_DRAIN_EVENTS_TIMEOUT, 1000);
conf.set("yarn.log.dir", "target"); conf.set("yarn.log.dir", "target");
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
// mark if we need to launch the v1 timeline server // mark if we need to launch the v1 timeline server
@ -183,9 +185,6 @@ public class TestDistributedShell {
conf.set(YarnConfiguration.NM_AUX_SERVICES, TIMELINE_AUX_SERVICE_NAME); conf.set(YarnConfiguration.NM_AUX_SERVICES, TIMELINE_AUX_SERVICE_NAME);
conf.set(YarnConfiguration.NM_AUX_SERVICES + "." + TIMELINE_AUX_SERVICE_NAME conf.set(YarnConfiguration.NM_AUX_SERVICES + "." + TIMELINE_AUX_SERVICE_NAME
+ ".class", PerNodeTimelineCollectorsAuxService.class.getName()); + ".class", PerNodeTimelineCollectorsAuxService.class.getName());
conf.setBoolean(YarnConfiguration.SYSTEM_METRICS_PUBLISHER_ENABLED, true);
conf.setBoolean(YarnConfiguration.RM_SYSTEM_METRICS_PUBLISHER_ENABLED,
false);
} else { } else {
Assert.fail("Wrong timeline version number: " + timelineVersion); Assert.fail("Wrong timeline version number: " + timelineVersion);
} }
@ -280,7 +279,7 @@ public class TestDistributedShell {
testDSShell(true); testDSShell(true);
} }
@Test(timeout=90000) @Test
@TimelineVersion(2.0f) @TimelineVersion(2.0f)
public void testDSShellWithoutDomainV2() throws Exception { public void testDSShellWithoutDomainV2() throws Exception {
testDSShell(false); testDSShell(false);
@ -290,12 +289,14 @@ public class TestDistributedShell {
testDSShell(haveDomain, true); testDSShell(haveDomain, true);
} }
@Test(timeout=90000) @Test
@TimelineVersion(2.0f)
public void testDSShellWithoutDomainV2DefaultFlow() throws Exception { public void testDSShellWithoutDomainV2DefaultFlow() throws Exception {
testDSShell(false, true); testDSShell(false, true);
} }
@Test(timeout=90000) @Test
@TimelineVersion(2.0f)
public void testDSShellWithoutDomainV2CustomizedFlow() throws Exception { public void testDSShellWithoutDomainV2CustomizedFlow() throws Exception {
testDSShell(false, false); testDSShell(false, false);
} }