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:
parent
db2afa8bae
commit
0d0ccfd7c1
|
@ -271,6 +271,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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue