Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A6EAB200D19 for ; Fri, 22 Sep 2017 03:52:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A54C51609E6; Fri, 22 Sep 2017 01:52:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EE8981609E1 for ; Fri, 22 Sep 2017 03:52:42 +0200 (CEST) Received: (qmail 65321 invoked by uid 500); 22 Sep 2017 01:52:33 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 64748 invoked by uid 99); 22 Sep 2017 01:52:33 -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; Fri, 22 Sep 2017 01:52:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BECDF5A9E; Fri, 22 Sep 2017 01:52:32 +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: Fri, 22 Sep 2017 01:52:57 -0000 Message-Id: In-Reply-To: <9327d97db72a4f4f9bdcf1d2908b30ce@git.apache.org> References: <9327d97db72a4f4f9bdcf1d2908b30ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] hadoop git commit: MAPREDUCE-6958. Shuffle audit logger should log size of shuffle transfer. Contributed by Jason Lowe archived-at: Fri, 22 Sep 2017 01:52:43 -0000 MAPREDUCE-6958. Shuffle audit logger should log size of shuffle transfer. Contributed by Jason Lowe Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a20debd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a20debd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a20debd Branch: refs/heads/YARN-6592 Commit: 3a20debddeac69596ceb5b36f8413529ea8570e6 Parents: ea845ba Author: Jason Lowe Authored: Tue Sep 19 09:13:17 2017 -0500 Committer: Jason Lowe Committed: Tue Sep 19 09:13:17 2017 -0500 ---------------------------------------------------------------------- .../org/apache/hadoop/mapred/ShuffleHandler.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a20debd/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 863da7e..b7f2c6d 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 @@ -992,13 +992,6 @@ public class ShuffleHandler extends AuxiliaryService { return; } - // this audit log is disabled by default, - // to turn it on please enable this audit log - // on log4j.properties by uncommenting the setting - if (AUDITLOG.isDebugEnabled()) { - AUDITLOG.debug("shuffle for " + jobQ.get(0) + " mappers: " + mapIds + - " reducer " + reduceQ.get(0)); - } int reduceId; String jobId; try { @@ -1183,6 +1176,17 @@ public class ShuffleHandler extends AuxiliaryService { // Now set the response headers. setResponseHeaders(response, keepAliveParam, contentLength); + + // this audit log is disabled by default, + // to turn it on please enable this audit log + // on log4j.properties by uncommenting the setting + if (AUDITLOG.isDebugEnabled()) { + StringBuilder sb = new StringBuilder("shuffle for "); + sb.append(jobId).append(" reducer ").append(reduce); + sb.append(" length ").append(contentLength); + sb.append(" mappers: ").append(mapIds); + AUDITLOG.debug(sb.toString()); + } } protected void setResponseHeaders(HttpResponse response, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org