Repository: hadoop
Updated Branches:
  refs/heads/branch-2 1d19557dd -> 280c9b840


YARN-4614. Fix random failure in 
TestApplicationPriority#testApplicationPriorityAllocationWithChangeInPriority. 
(Sunil G via rohithsharmaks)

(cherry picked from commit 99829eb221482928d8a1b148ae3c802cc7c9253e)


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

Branch: refs/heads/branch-2
Commit: 280c9b8401863d6ddb3b666b7844bbde87cb6007
Parents: 1d19557
Author: rohithsharmaks <[email protected]>
Authored: Sat Jan 23 07:56:15 2016 +0530
Committer: rohithsharmaks <[email protected]>
Committed: Sat Jan 23 07:58:16 2016 +0530

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                   | 3 +++
 .../scheduler/capacity/TestApplicationPriority.java               | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/280c9b84/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b197101..b902567 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1264,6 +1264,9 @@ Release 2.8.0 - UNRELEASED
     YARN-4605. Spelling mistake in the help message of "yarn 
applicationattempt"
     command. (Weiwei Yang via aajisaka)
 
+    YARN-4614. Fix random failure in 
TestApplicationPriority#testApplicationPriority
+    AllocationWithChangeInPriority. (Sunil G via rohithsharmaks)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/280c9b84/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.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/TestApplicationPriority.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/TestApplicationPriority.java
index e32a33b..1569a12 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/TestApplicationPriority.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/TestApplicationPriority.java
@@ -490,7 +490,6 @@ public class TestApplicationPriority {
     RMApp app2 = rm.submitApp(1 * GB, appPriority2);
 
     // kick the scheduler, 1 GB which was free is given to AM of App2
-    nm1.nodeHeartbeat(true);
     MockAM am2 = MockRM.launchAM(app2, rm, nm1);
     am2.registerAppAttempt();
 

Reply via email to