YARN-11384: NPE in DelegationTokenRenewer causes all subsequent apps …

…to fail with "Timer already cancelled" (apache#7404) Contributed by Cheng Pan. Reviewed-by: Shilun Fan <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
bhattmanish98 · Feb 19, 2025 · 06ff1b6 · 06ff1b6
1 parent 744fe66
commit 06ff1b6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...n/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java b/...n/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
@@ -807,10 +807,13 @@ private void cancelToken(DelegationTokenToRenew t) {
   private void removeFailedDelegationToken(DelegationTokenToRenew t) {
     Collection<ApplicationId> applicationIds = t.referringAppIds;
     synchronized (applicationIds) {
-      LOG.error("removing failed delegation token for appid=" + applicationIds
-          + ";t=" + t.token.getService());
+      LOG.error("removing failed delegation token for appid={};t={}",
+          applicationIds, t.token.getService());
       for (ApplicationId applicationId : applicationIds) {
-        appTokens.get(applicationId).remove(t);
+        Set<DelegationTokenToRenew> tokens = appTokens.get(applicationId);
+        if (tokens != null && !tokens.isEmpty()) {
+          tokens.remove(t);
+        }
       }
     }
     allTokens.remove(t.token);