big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-5353. ResourceManager can leak delegation tokens when they are shared across apps. (Jason Lowe via Varun Saxena).

Browse Source
This commit is contained in:
Varun Saxena 2016-07-13 07:55:34 +05:30
parent a290a98b6a
commit 06c56ff79b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
View File

@ -773,7 +773,7 @@ public void updateKeepAliveApplications(List<ApplicationId> appIds) {
private void removeApplicationFromRenewal(ApplicationId applicationId) { private void removeApplicationFromRenewal(ApplicationId applicationId) {
rmContext.getSystemCredentialsForApps().remove(applicationId); rmContext.getSystemCredentialsForApps().remove(applicationId);
Set<DelegationTokenToRenew> tokens = appTokens.get(applicationId); Set<DelegationTokenToRenew> tokens = appTokens.remove(applicationId);
if (tokens != null && !tokens.isEmpty()) { if (tokens != null && !tokens.isEmpty()) {
synchronized (tokens) { synchronized (tokens) {
@ -798,15 +798,10 @@ private void removeApplicationFromRenewal(ApplicationId applicationId) {
// cancel the token // cancel the token
cancelToken(dttr); cancelToken(dttr);
it.remove();
allTokens.remove(dttr.token); allTokens.remove(dttr.token);
} }
} }
} }
if(tokens != null && tokens.isEmpty()) {
appTokens.remove(applicationId);
}
} }
/** /**

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
View File

@ -1254,6 +1254,9 @@ public void testCancelWithMultipleAppSubmissions() throws Exception{
Assert.assertTrue(dttr.referringAppIds.isEmpty()); Assert.assertTrue(dttr.referringAppIds.isEmpty());
Assert.assertTrue(dttr.isTimerCancelled()); Assert.assertTrue(dttr.isTimerCancelled());
Assert.assertTrue(Renewer.cancelled); Assert.assertTrue(Renewer.cancelled);
// make sure the token also has been removed from appTokens
Assert.assertFalse(renewer.getDelegationTokens().contains(token1));
} }
} }