Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r1555975 from trunk. YARN-1560. Fixed TestYarnClient#testAMMRTokens failure with null AMRM token. (Contributed by Ted Yu) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555977 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jian He 2014-01-06 19:03:43 +00:00
parent db2afa8bae
commit 0d0ccfd7c1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -271,6 +271,9 @@ Release 2.4.0 - UNRELEASED
YARN-1559. Race between ServerRMProxy and ClientRMProxy setting YARN-1559. Race between ServerRMProxy and ClientRMProxy setting
RMProxy#INSTANCE. (kasha and vinodkv via kasha) 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 Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

14
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
View File

@ -378,6 +378,13 @@ public class TestYarnClient {
appId = createApp(rmClient, true); appId = createApp(rmClient, true);
waitTillAccepted(rmClient, appId); 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 //unmanaged AMs do return AMRM token
Assert.assertNotNull(rmClient.getAMRMToken(appId)); Assert.assertNotNull(rmClient.getAMRMToken(appId));
@ -392,6 +399,13 @@ public class TestYarnClient {
rmClient.start(); rmClient.start();
ApplicationId appId = createApp(rmClient, true); ApplicationId appId = createApp(rmClient, true);
waitTillAccepted(rmClient, appId); 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 //unmanaged AMs do return AMRM token
Assert.assertNotNull(rmClient.getAMRMToken(appId)); Assert.assertNotNull(rmClient.getAMRMToken(appId));
return appId; return appId;