From 2e5eef9da23b7fe58876987c3348a4fba653f551 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Wed, 14 Jan 2015 17:38:35 +0900 Subject: [PATCH] MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationID() for logging AttemptId in RMContainerAllocator.java (Contributed by Leitao Guo) (cherry picked from commit d336d136785ef1e49e0a110a1b9f0d1824829877) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index b119b467aae..78099d491f4 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -38,6 +38,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) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java index e60ce537ae4..5f4313c728e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java @@ -674,7 +674,7 @@ private List 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.");