diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java index dfcceb8..1839d98 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java @@ -626,7 +626,13 @@ private void requestNewHdfsDelegationToken(ApplicationId applicationId, // cancel a token private void cancelToken(DelegationTokenToRenew t) { if(t.shouldCancelAtEnd) { + // cancel the timer + if (t.timerTask != null) { + t.timerTask.cancel(); + } + dtCancelThread.cancelToken(t.token, t.conf); + allTokens.remove(t.token); } else { LOG.info("Did not cancel "+t); } @@ -699,15 +705,10 @@ private void removeApplicationFromRenewal(ApplicationId applicationId) { + "; token=" + dttr.token.getService()); } - // cancel the timer - if (dttr.timerTask != null) - dttr.timerTask.cancel(); - // cancel the token cancelToken(dttr); it.remove(); - allTokens.remove(dttr.token); } } }