MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct. (Junping Du via llu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1429044 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)
 

src/mapred/org/apache/hadoop/mapred/JobInProgress.java

@@ -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) {