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-0.23@1483581 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -21,6 +21,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 - 2013-04-18
 
   INCOMPATIBLE CHANGES

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

@@ -236,6 +236,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) {