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

This commit is contained in:
Akira Ajisaka 2015-01-14 17:38:35 +09:00
parent f92e503800
commit d336d13678
2 changed files with 4 additions and 1 deletions

View File

@ -268,6 +268,9 @@ Release 2.7.0 - UNRELEASED
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
ssl-client.xml (Yangping Wu via harsh)

View File

@ -684,7 +684,7 @@ private List<Container> getResources() throws Exception {
JobEventType.JOB_AM_REBOOT));
throw new YarnRuntimeException(
"Resource Manager doesn't recognize AttemptId: "
+ this.getContext().getApplicationID(), e);
+ this.getContext().getApplicationAttemptId(), e);
} catch (ApplicationMasterNotRegisteredException e) {
LOG.info("ApplicationMaster is out of sync with ResourceManager,"
+ " hence resync and send outstanding requests.");