From 1c0c77e7f0101e880682d76419b88f16bd663bcd Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ozawa <ozawa@apache.org>
Date: Mon, 9 Nov 2015 15:25:31 +0900
Subject: [PATCH] MAPREDUCE-5763. Warn message about httpshuffle in NM logs.
 Contributed by Akira AJISAKA.

(cherry picked from commit 668e897538e317d96784f75b4e1f979c72225db7)
---
 hadoop-mapreduce-project/CHANGES.txt                           | 3 +++
 .../src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index bab1e022d1e..151dd54e376 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -130,6 +130,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6489. Fail fast rogue tasks that write too much to local disk
     (Maysam Yabandeh via jlowe)
 
+    MAPREDUCE-5763. Warn message about httpshuffle in NM logs.
+    (Akira AJISAKA via ozawa)
+
   OPTIMIZATIONS
 
     MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
index d24b3a45b71..2fb7811080b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
@@ -356,7 +356,7 @@ public class ShuffleHandler extends AuxiliaryService {
   }
 
   ShuffleHandler(MetricsSystem ms) {
-    super("httpshuffle");
+    super(MAPREDUCE_SHUFFLE_SERVICEID);
     metrics = ms.register(new ShuffleMetrics());
   }