MAPREDUCE-5660. Log info about possible thrashing (when using memory-based scheduling in Capacity Scheduler) is not printed. Contributed by Adam Kawa.

CHANGES.txt

@@ -66,6 +66,10 @@ Release 1.3.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-5660. Log info about possible thrashing (when using
+    memory-based scheduling in Capacity Scheduler) is not printed
+    (Adam Kawa via harsh)
+
     MAPREDUCE-5556. mapred docs have incorrect classpath (harsh)
 
     MAPREDUCE-5272. Minor error in javadoc of TestMRWithDistributedCache

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

@@ -4460,11 +4460,13 @@ public class TaskTracker implements MRConstants, TaskUmbilicalProtocol,
         }
       }
     }
-    if (totalMemoryAllottedForTasks > totalPhysicalMemoryOnTT) {
-      LOG.info("totalMemoryAllottedForTasks > totalPhysicalMemoryOnTT."
+
+    long totalMemoryAllottedForTasksInBytes = totalMemoryAllottedForTasks * 1024 * 1024;
+    if (totalMemoryAllottedForTasksInBytes > totalPhysicalMemoryOnTT) {
+      LOG.info("totalMemoryAllottedForTasksInBytes > totalPhysicalMemoryOnTT."
           + " Thrashing might happen.");
-    } else if (totalMemoryAllottedForTasks > totalVirtualMemoryOnTT) {
-      LOG.info("totalMemoryAllottedForTasks > totalVirtualMemoryOnTT."
+    } else if (totalMemoryAllottedForTasksInBytes > totalVirtualMemoryOnTT) {
+      LOG.info("totalMemoryAllottedForTasksInBytes > totalVirtualMemoryOnTT."
           + " Thrashing might happen.");
     }