You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ji...@apache.org on 2014/04/04 20:45:37 UTC
svn commit: r1584864 - in
/hadoop/common/branches/branch-2.4/hadoop-yarn-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java
Author: jianhe
Date: Fri Apr 4 18:45:37 2014
New Revision: 1584864
URL: http://svn.apache.org/r1584864
Log:
Merge r1584863 from branch-2. YARN-1837. Fixed TestMoveApplication#testMoveRejectedByScheduler failure. Contributed by Hong Zhiguo
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1584864&r1=1584863&r2=1584864&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Fri Apr 4 18:45:37 2014
@@ -15,6 +15,9 @@ Release 2.4.1 - UNRELEASED
YARN-1898. Made Standby RM links conf, stacks, logLevel, metrics, jmx, logs
and static not be redirected to Active RM. (Xuan Gong via zjshen)
+ YARN-1837. Fixed TestMoveApplication#testMoveRejectedByScheduler failure.
+ (Hong Zhiguo via jianhe)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java?rev=1584864&r1=1584863&r2=1584864&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java Fri Apr 4 18:45:37 2014
@@ -72,6 +72,13 @@ public class TestMoveApplication {
Application application = new Application("user1", resourceManager);
application.submit();
+ // Wait for app to be accepted
+ RMApp app = resourceManager.rmContext.getRMApps()
+ .get(application.getApplicationId());
+ while (app.getState() != RMAppState.ACCEPTED) {
+ Thread.sleep(100);
+ }
+
ClientRMService clientRMService = resourceManager.getClientRMService();
try {
// FIFO scheduler does not support moves