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 ll...@apache.org on 2013/01/04 20:19:20 UTC

svn commit: r1429044 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobInProgress.java

Author: llu
Date: Fri Jan  4 19:19:19 2013
New Revision: 1429044

URL: http://svn.apache.org/viewvc?rev=1429044&view=rev
Log:
MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct. (Junping Du via llu)

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobInProgress.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1429044&r1=1429043&r2=1429044&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Jan  4 19:19:19 2013
@@ -164,6 +164,9 @@ Release 1.2.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct.
+    (Junping Du via llu)
+
     MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant.
     (Yu Gao via llu)
 

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1429044&r1=1429043&r2=1429044&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Fri Jan  4 19:19:19 2013
@@ -1788,20 +1788,26 @@ public class JobInProgress {
       boolean isNodeGroupAware) {
     switch (level) {
       case 0:
+        // level 0 means data-local
         logAndIncrDataLocalMaps(tip);
         break;
       case 1:
         if (isNodeGroupAware) {
+          // level 1 in case of with-NodeGroup means nodegroup-local
           logAndIncrNodeGroupLocalMaps(tip);
         } else {
+          // level 1 in case of without-NodeGroup means rack-local
           logAndIncrRackLocalMaps(tip);
         }
         break;
       case 2:
         if (isNodeGroupAware) {
+          // level 2 in case of with-NodeGroup means rack-local
           logAndIncrRackLocalMaps(tip);
+          break;
         }
-        break;
+        // in case of without-NodeGroup, level 2 falls through to other-local
+        // handled by default
       default:
         // check if there is any locality
         if (level != this.maxLevel) {