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

Merge r1615270 from trunk. YARN-2343. Improve NMToken expire exception message. Contributed by Li Lu 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615271 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jian He 2014-08-01 23:46:26 +00:00
parent 743837b259
commit 2417753952
2 changed files with 4 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

@ -62,6 +62,8 @@ Release 2.6.0 - UNRELEASED
YARN-1994. Expose YARN/MR endpoints on multiple interfaces. (Craig Welch, YARN-1994. Expose YARN/MR endpoints on multiple interfaces. (Craig Welch,
Milan Potocnik, Arpit Agarwal via xgong) Milan Potocnik, Arpit Agarwal via xgong)
YARN-2343. Improve NMToken expire exception message. (Li Lu via jianhe)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
View File

@ -514,6 +514,8 @@ public class ContainerManagerImpl extends CompositeService implements
messageBuilder.append("\nThis token is expired. current time is ") messageBuilder.append("\nThis token is expired. current time is ")
.append(System.currentTimeMillis()).append(" found ") .append(System.currentTimeMillis()).append(" found ")
.append(containerTokenIdentifier.getExpiryTimeStamp()); .append(containerTokenIdentifier.getExpiryTimeStamp());
messageBuilder.append("\nNote: System times on machines may be out of sync.")
.append(" Check system time and time zones.");
} }
if (unauthorized) { if (unauthorized) {
String msg = messageBuilder.toString(); String msg = messageBuilder.toString();