Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Robert Joseph Evans 2013-05-16 21:42:41 +00:00
parent 4069886102
commit 59a272eae6
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -606,6 +606,8 @@ Release 0.23.8 - UNRELEASED
YARN-363. Add webapps/proxy directory without which YARN proxy-server fails YARN-363. Add webapps/proxy directory without which YARN proxy-server fails
when started in stand-alone mode. (Kenji Kikushima via vinodkv) 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 Release 0.23.7 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
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

@ -241,6 +241,9 @@ public class DelegationTokenRenewer extends AbstractService {
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Failed to cancel token " + tokenWithConf.token + " " + LOG.warn("Failed to cancel token " + tokenWithConf.token + " " +
StringUtils.stringifyException(e)); StringUtils.stringifyException(e));
} catch (RuntimeException e) {
LOG.warn("Failed to cancel token " + tokenWithConf.token + " " +
StringUtils.stringifyException(e));
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
return; return;
} catch (Throwable t) { } catch (Throwable t) {