From ea845ba58c585647c4be8d30d9b814f098e34a12 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Tue, 19 Sep 2017 08:45:05 -0500 Subject: [PATCH] Revert "MAPREDUCE-6958. Shuffle audit logger should log size of shuffle transfer. Contributed by Jason Lowe" This reverts commit b3d61304f2fa4a99526f7a60ccaac9f262083079. --- .../apache/hadoop/mapred/ShuffleHandler.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) 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 06a3e429036..863da7efde9 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,6 +992,13 @@ 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 { @@ -1176,17 +1183,6 @@ 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 ").append(jobId); - sb.append(" mappers: ").append(mapIds); - sb.append(" reducer ").append(reduce); - sb.append(" length ").append(contentLength); - AUDITLOG.debug(sb.toString()); - } } protected void setResponseHeaders(HttpResponse response,