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 to...@apache.org on 2011/11/15 01:42:16 UTC
svn commit: r1201983 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/mapred/org/apache/hadoop/mapred/ReduceTask.java
Author: todd
Date: Tue Nov 15 00:42:15 2011
New Revision: 1201983
URL: http://svn.apache.org/viewvc?rev=1201983&view=rev
Log:
MAPREDUCE-3394. Add log guard for a debug message in ReduceTask. Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1201983&r1=1201982&r2=1201983&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Tue Nov 15 00:42:15 2011
@@ -63,6 +63,8 @@ Release 0.20.206.0 - unreleased
MAPREDUCE-3015. Add local dir failure info to metrics and the web UI. (eli)
+ MAPREDUCE-3394. Add log guard for a debug message in ReduceTask (todd)
+
Release 0.20.205.1 - unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/ReduceTask.java?rev=1201983&r1=1201982&r2=1201983&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/ReduceTask.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/ReduceTask.java Tue Nov 15 00:42:15 2011
@@ -2178,8 +2178,10 @@ class ReduceTask extends Task {
} catch (InterruptedException e) { } // IGNORE
while (numInFlight > 0 && mergeThrowable == null) {
- LOG.debug(reduceTask.getTaskID() + " numInFlight = " +
- numInFlight);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(reduceTask.getTaskID() + " numInFlight = " +
+ numInFlight);
+ }
//the call to getCopyResult will either
//1) return immediately with a null or a valid CopyResult object,
// or