hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From varunsax...@apache.org
Subject hadoop git commit: YARN-5491. Fix random failure of TestCapacityScheduler#testCSQueueBlocked (Bibin A Chundatt via Varun Saxena)
Date Sun, 14 Aug 2016 22:01:48 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 23c6e3c4e -> d677b68c2


YARN-5491. Fix random failure of TestCapacityScheduler#testCSQueueBlocked (Bibin A Chundatt
via Varun Saxena)


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

Branch: refs/heads/trunk
Commit: d677b68c2599445fff56db4df26448a8bad0f5dd
Parents: 23c6e3c
Author: Varun Saxena <varunsaxena@apache.org>
Authored: Mon Aug 15 03:31:21 2016 +0530
Committer: Varun Saxena <varunsaxena@apache.org>
Committed: Mon Aug 15 03:31:21 2016 +0530

----------------------------------------------------------------------
 .../scheduler/capacity/TestCapacityScheduler.java            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d677b68c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
index 2da7adb..0b52b86 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
@@ -3635,7 +3635,7 @@ public class TestCapacityScheduler {
     }
     assertEquals("A Used Resource should be 2 GB", 2 * GB,
         cs.getQueue("a").getUsedResources().getMemorySize());
-    assertEquals("B Used Resource should be 2 GB", 13 * GB,
+    assertEquals("B Used Resource should be 13 GB", 13 * GB,
         cs.getQueue("b").getUsedResources().getMemorySize());
     r1 = TestUtils.createResourceRequest(
         ResourceRequest.ANY, 2 * GB, 1, true, priority, recordFactory);
@@ -3659,10 +3659,14 @@ public class TestCapacityScheduler {
     ContainerId containerId2 =ContainerId.newContainerId(appAttemptId2, 11);
 
     cs.handle(new ContainerExpiredSchedulerEvent(containerId1));
+    rm.drainEvents();
+    CapacityScheduler.schedule(cs);
+
     cs.handle(new ContainerExpiredSchedulerEvent(containerId2));
     CapacityScheduler.schedule(cs);
     rm.drainEvents();
-    assertEquals("A Used Resource should be 2 GB", 4 * GB,
+
+    assertEquals("A Used Resource should be 4 GB", 4 * GB,
         cs.getQueue("a").getUsedResources().getMemorySize());
     assertEquals("B Used Resource should be 12 GB", 12 * GB,
         cs.getQueue("b").getUsedResources().getMemorySize());


---------------------------------------------------------------------
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