From 59a272eae62a15e104879810cc71c714d7c4fd2d Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Thu, 16 May 2013 21:42:41 +0000 Subject: [PATCH] svn merge -c 1483578 FIXES: YARN-690. RM exits on token cancel/renew problems (daryn via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483579 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../resourcemanager/security/DelegationTokenRenewer.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3a395cfce87..73fb99acb49 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -606,6 +606,8 @@ Release 0.23.8 - UNRELEASED YARN-363. Add webapps/proxy directory without which YARN proxy-server fails when started in stand-alone mode. (Kenji Kikushima via vinodkv) + YARN-690. RM exits on token cancel/renew problems (daryn via bobby) + Release 0.23.7 - UNRELEASED INCOMPATIBLE CHANGES 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 a0370c753e1..fbcbb70dcdf 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 @@ -241,6 +241,9 @@ public class DelegationTokenRenewer extends AbstractService { } catch (IOException e) { LOG.warn("Failed to cancel token " + tokenWithConf.token + " " + StringUtils.stringifyException(e)); + } catch (RuntimeException e) { + LOG.warn("Failed to cancel token " + tokenWithConf.token + " " + + StringUtils.stringifyException(e)); } catch (InterruptedException ie) { return; } catch (Throwable t) {