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

YARN-2018: Merging r1592783 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-05-06 15:47:01 +00:00
parent 6b7d074a54
commit c03108299b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,9 @@ Release 2.5.0 - UNRELEASED
YARN-738. TestClientRMTokens is failing irregularly while running all yarn YARN-738. TestClientRMTokens is failing irregularly while running all yarn
tests (Ming Ma via jlowe) tests (Ming Ma via jlowe)
YARN-2018. TestClientRMService.testTokenRenewalWrongUser fails after
HADOOP-10562 (Ming Ma via Arpit Agarwal)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
View File

@ -478,9 +478,8 @@ public class TestClientRMService {
checkTokenRenewal(owner, other); checkTokenRenewal(owner, other);
return null; return null;
} catch (YarnException ex) { } catch (YarnException ex) {
Assert.assertTrue(ex.getMessage().contains( Assert.assertTrue(ex.getMessage().contains(owner.getUserName() +
"Client " + owner.getUserName() + " tries to renew a token with renewer " +
" tries to renew a token with renewer specified as " +
other.getUserName())); other.getUserName()));
throw ex; throw ex;
} }