From 25f4a0193b5ce30520c6558e830b2cbec89e9ff3 Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Fri, 12 Dec 2014 11:42:03 +0530 Subject: [PATCH] MAPREDUCE-6046. Change the class name for logs in RMCommunicator. Contributed by Sahil Takiar. (cherry picked from commit 0bd022911013629a8c9e7357fae8cf4399d7a1e3) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index eaa37a18f37..858ac0589ad 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -14,6 +14,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log (Gera Shegalov via jlowe) + MAPREDUCE-6046. Change the class name for logs in RMCommunicator + (Sahil Takiar via devaraj) + OPTIMIZATIONS MAPREDUCE-6169. MergeQueue should release reference to the current item diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java index cd4e272e60f..5d4fa12ead2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java @@ -67,7 +67,7 @@ import org.apache.hadoop.yarn.proto.YarnServiceProtos.SchedulerResourceTypes; */ public abstract class RMCommunicator extends AbstractService implements RMHeartbeatHandler { - private static final Log LOG = LogFactory.getLog(RMContainerAllocator.class); + private static final Log LOG = LogFactory.getLog(RMCommunicator.class); private int rmPollInterval;//millis protected ApplicationId applicationId; private final AtomicBoolean stopped;