You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2015/11/15 21:03:44 UTC
[20/50] [abbrv] hadoop git commit: MAPREDUCE-5763. Warn message about
httpshuffle in NM logs. Contributed by Akira AJISAKA.
MAPREDUCE-5763. Warn message about httpshuffle in NM logs. Contributed by Akira AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/668e8975
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/668e8975
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/668e8975
Branch: refs/heads/yarn-2877
Commit: 668e897538e317d96784f75b4e1f979c72225db7
Parents: 655d434
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Mon Nov 9 15:25:31 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Mon Nov 9 15:25:31 2015 +0900
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/668e8975/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 17b7f4e..766d300 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/668e8975/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
----------------------------------------------------------------------
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 d24b3a4..2fb7811 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());
}