Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A18718F6A for ; Sun, 15 Nov 2015 20:03:36 +0000 (UTC) Received: (qmail 28190 invoked by uid 500); 15 Nov 2015 20:03:26 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 27808 invoked by uid 500); 15 Nov 2015 20:03:26 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 26980 invoked by uid 99); 15 Nov 2015 20:03:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Nov 2015 20:03:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B41FCE0F7A; Sun, 15 Nov 2015 20:03:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asuresh@apache.org To: common-commits@hadoop.apache.org Date: Sun, 15 Nov 2015 20:03:44 -0000 Message-Id: <6621ab9501e64cf79c225368cdc00c2d@git.apache.org> In-Reply-To: <6821852839e3432c8951a5d43edd1cf3@git.apache.org> References: <6821852839e3432c8951a5d43edd1cf3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon Nov 9 15:25:31 2015 +0900 Committer: Tsuyoshi Ozawa 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()); }