From 668e897538e317d96784f75b4e1f979c72225db7 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 9 Nov 2015 15:25:31 +0900 Subject: [PATCH] MAPREDUCE-5763. Warn message about httpshuffle in NM logs. Contributed by Akira AJISAKA. --- 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 17b7f4e423..766d3005da 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -423,6 +423,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 d24b3a45b7..2fb7811080 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 AtomicInteger getMapsToWait() { } ShuffleHandler(MetricsSystem ms) { - super("httpshuffle"); + super(MAPREDUCE_SHUFFLE_SERVICEID); metrics = ms.register(new ShuffleMetrics()); }