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

MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationID() for logging AttemptId in RMContainerAllocator.java (Contributed by Leitao Guo) 

(cherry picked from commit d336d13678)
This commit is contained in:
Akira Ajisaka 2015-01-14 17:38:35 +09:00
parent 0119e717ae
commit 2e5eef9da2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -38,6 +38,9 @@ Release 2.7.0 - UNRELEASED
BUG FIXES BUG FIXES
MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationId()
for logging AttemptId in RMContainerAllocator.java (Leitao Guo via aajisaka)
MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about
ssl-client.xml (Yangping Wu via harsh) ssl-client.xml (Yangping Wu via harsh)

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
View File

@ -674,7 +674,7 @@ public class RMContainerAllocator extends RMContainerRequestor
JobEventType.JOB_AM_REBOOT)); JobEventType.JOB_AM_REBOOT));
throw new YarnRuntimeException( throw new YarnRuntimeException(
"Resource Manager doesn't recognize AttemptId: " "Resource Manager doesn't recognize AttemptId: "
+ this.getContext().getApplicationID(), e); + this.getContext().getApplicationAttemptId(), e);
} catch (ApplicationMasterNotRegisteredException e) { } catch (ApplicationMasterNotRegisteredException e) {
LOG.info("ApplicationMaster is out of sync with ResourceManager," LOG.info("ApplicationMaster is out of sync with ResourceManager,"
+ " hence resync and send outstanding requests."); + " hence resync and send outstanding requests.");