hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sj...@apache.org
Subject hadoop git commit: YARN-5050. Code cleanup for TestDistributedShell (Li Lu via sjlee)
Date Fri, 20 May 2016 00:26:53 GMT
Repository: hadoop
Updated Branches:
  refs/heads/YARN-2928 8d0b4267e -> 2c93006dc


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c93006d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c93006d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c93006d

Branch: refs/heads/YARN-2928
Commit: 2c93006dc0de8b92018aa8023f2bfa3ce331680a
Parents: 8d0b426
Author: Sangjin Lee <sjlee@apache.org>
Authored: Thu May 19 17:25:05 2016 -0700
Committer: Sangjin Lee <sjlee@apache.org>
Committed: Thu May 19 17:25:05 2016 -0700

----------------------------------------------------------------------
 .../distributedshell/TestDistributedShell.java         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c93006d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
index 4a401e7..22c16e3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
@@ -135,6 +135,8 @@ public class TestDistributedShell {
 
     conf = new YarnConfiguration();
     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.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
     // 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
         + ".class", PerNodeTimelineCollectorsAuxService.class.getName());
-      conf.setBoolean(YarnConfiguration.SYSTEM_METRICS_PUBLISHER_ENABLED, true);
-      conf.setBoolean(YarnConfiguration.RM_SYSTEM_METRICS_PUBLISHER_ENABLED,
-          false);
     } else {
       Assert.fail("Wrong timeline version number: " + timelineVersion);
     }
@@ -280,7 +279,7 @@ public class TestDistributedShell {
     testDSShell(true);
   }
 
-  @Test(timeout=90000)
+  @Test
   @TimelineVersion(2.0f)
   public void testDSShellWithoutDomainV2() throws Exception {
     testDSShell(false);
@@ -290,12 +289,14 @@ public class TestDistributedShell {
     testDSShell(haveDomain, true);
   }
 
-  @Test(timeout=90000)
+  @Test
+  @TimelineVersion(2.0f)
   public void testDSShellWithoutDomainV2DefaultFlow() throws Exception {
     testDSShell(false, true);
   }
 
-  @Test(timeout=90000)
+  @Test
+  @TimelineVersion(2.0f)
   public void testDSShellWithoutDomainV2CustomizedFlow() throws Exception {
     testDSShell(false, false);
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message