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

YARN-1454. Fixed test failure issue with TestRMRestart. Contributed by Karthik Kambatla. 

svn merge --ignore-ancestry -c 1547651 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547653 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-12-04 00:22:52 +00:00
parent cf465c26a8
commit 2e30ca92f3
2 changed files with 5 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

@ -179,6 +179,9 @@ Release 2.4.0 - UNRELEASED
YARN-895. Changed RM state-store to not crash immediately if RM restarts while YARN-895. Changed RM state-store to not crash immediately if RM restarts while
the state-store is down. (Jian He via vinodkv) the state-store is down. (Jian He via vinodkv)
YARN-1454. Fixed test failure issue with TestRMRestart. (Karthik Kambatla
via vinodkv)
Release 2.3.0 - UNRELEASED Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
View File

@ -1247,6 +1247,8 @@ public class TestRMRestart {
// renewDate before renewing // renewDate before renewing
Long renewDateBeforeRenew = allTokensRM2.get(dtId1); Long renewDateBeforeRenew = allTokensRM2.get(dtId1);
try{ try{
// Sleep for one millisecond to make sure renewDataAfterRenew is greater
Thread.sleep(1);
// renew recovered token // renew recovered token
rm2.getRMDTSecretManager().renewToken(token1, "renewer1"); rm2.getRMDTSecretManager().renewToken(token1, "renewer1");
} catch(Exception e) { } catch(Exception e) {