You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bi...@apache.org on 2017/06/30 17:03:15 UTC

hadoop git commit: YARN-6749. TestAppSchedulingInfo.testPriorityAccounting fails consistently. Contributed by Naganarasimha G R

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 2956c584c -> f6fcbf426


YARN-6749. TestAppSchedulingInfo.testPriorityAccounting fails consistently. Contributed by Naganarasimha G R


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

Branch: refs/heads/branch-2.8
Commit: f6fcbf426fd0489049c7ef498f6d04f688cb7fd1
Parents: 2956c58
Author: bibinchundatt <bi...@apache.org>
Authored: Fri Jun 30 21:52:16 2017 +0530
Committer: bibinchundatt <bi...@apache.org>
Committed: Fri Jun 30 21:52:16 2017 +0530

----------------------------------------------------------------------
 .../resourcemanager/scheduler/TestAppSchedulingInfo.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6fcbf42/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAppSchedulingInfo.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/TestAppSchedulingInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAppSchedulingInfo.java
index 6981f2b..b74f4f9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAppSchedulingInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAppSchedulingInfo.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -106,7 +106,7 @@ public class TestAppSchedulingInfo {
 
     // iterate to verify no ConcurrentModificationException
     for (Priority priority: info.getPriorities()) {
-      info.allocate(NodeType.OFF_SWITCH, null, priority, req1, null);
+      info.allocate(NodeType.OFF_SWITCH, mock(SchedulerNode.class), priority, req1, null);
     }
     Assert.assertEquals(1, info.getPriorities().size());
     Assert.assertEquals(req2.getPriority(),
@@ -117,7 +117,7 @@ public class TestAppSchedulingInfo {
     reqs.clear();
     reqs.add(req2);
     info.updateResourceRequests(reqs, false);
-    info.allocate(NodeType.OFF_SWITCH, null, req2.getPriority(), req2, null);
+    info.allocate(NodeType.OFF_SWITCH, mock(SchedulerNode.class), req2.getPriority(), req2, null);
     Assert.assertEquals(0, info.getPriorities().size());
 
     req1 = ResourceRequest.newInstance(pri1,


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