hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject git commit: YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma (cherry picked from commit e16e25ab1beac89c8d8be4e9f2a7fbefe81d35f3)
Date Wed, 08 Oct 2014 18:03:09 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d9aa0f833 -> 5e6f86e3a


YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma
(cherry picked from commit e16e25ab1beac89c8d8be4e9f2a7fbefe81d35f3)


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

Branch: refs/heads/branch-2
Commit: 5e6f86e3aa4d56ea319fb62a7a8a66da18a3e11c
Parents: d9aa0f8
Author: Jian He <jianhe@apache.org>
Authored: Wed Oct 8 10:58:51 2014 -0700
Committer: Jian He <jianhe@apache.org>
Committed: Wed Oct 8 11:03:00 2014 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                           |  2 ++
 .../apache/hadoop/yarn/server/resourcemanager/MockRM.java | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e6f86e3/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 00e3069..5b97c78 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -558,6 +558,8 @@ Release 2.6.0 - UNRELEASED
     YARN-1857. CapacityScheduler headroom doesn't account for other AM's running.
     (Chen He and Craig Welch via jianhe)
 
+    YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. (Ming Ma via jianhe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e6f86e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.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/MockRM.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
index 4f5fdeb..5d37d48 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
@@ -386,7 +386,15 @@ public class MockRM extends ResourceManager {
     if (waitForAccepted) {
       waitForState(appId, RMAppState.ACCEPTED);
     }
-    return getRMContext().getRMApps().get(appId);
+    RMApp rmApp = getRMContext().getRMApps().get(appId);
+
+    // unmanaged AM won't go to RMAppAttemptState.SCHEDULED.
+    if (waitForAccepted && !unmanaged) {
+      waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
+          RMAppAttemptState.SCHEDULED);
+    }
+
+    return rmApp;
   }
 
   public MockNM registerNode(String nodeIdStr, int memory) throws Exception {


Mime
View raw message