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/01/06 19:57:24 UTC
svn commit: r1555975 - in /hadoop/common/trunk/hadoop-yarn-project:
CHANGES.txt
hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
Author: jianhe
Date: Mon Jan 6 18:57:23 2014
New Revision: 1555975
URL: http://svn.apache.org/r1555975
Log:
YARN-1560. Fixed TestYarnClient#testAMMRTokens failure with null AMRM token. (Contributed by Ted Yu)
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1555975&r1=1555974&r2=1555975&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Mon Jan 6 18:57:23 2014
@@ -289,6 +289,9 @@ Release 2.4.0 - UNRELEASED
YARN-1559. Race between ServerRMProxy and ClientRMProxy setting
RMProxy#INSTANCE. (kasha and vinodkv via kasha)
+ YARN-1560. Fixed TestYarnClient#testAMMRTokens failure with null AMRM token.
+ (Ted Yu via jianhe)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java?rev=1555975&r1=1555974&r2=1555975&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java Mon Jan 6 18:57:23 2014
@@ -378,6 +378,13 @@ public class TestYarnClient {
appId = createApp(rmClient, true);
waitTillAccepted(rmClient, appId);
+ long start = System.currentTimeMillis();
+ while (rmClient.getAMRMToken(appId) == null) {
+ if (System.currentTimeMillis() - start > 20 * 1000) {
+ Assert.fail("AMRM token is null");
+ }
+ Thread.sleep(100);
+ }
//unmanaged AMs do return AMRM token
Assert.assertNotNull(rmClient.getAMRMToken(appId));
@@ -392,6 +399,13 @@ public class TestYarnClient {
rmClient.start();
ApplicationId appId = createApp(rmClient, true);
waitTillAccepted(rmClient, appId);
+ long start = System.currentTimeMillis();
+ while (rmClient.getAMRMToken(appId) == null) {
+ if (System.currentTimeMillis() - start > 20 * 1000) {
+ Assert.fail("AMRM token is null");
+ }
+ Thread.sleep(100);
+ }
//unmanaged AMs do return AMRM token
Assert.assertNotNull(rmClient.getAMRMToken(appId));
return appId;