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 ha...@apache.org on 2015/03/21 22:07:36 UTC
hadoop git commit: MAPREDUCE-5660. Log info about possible thrashing
(when using memory-based scheduling in Capacity Scheduler) is not printed.
Contributed by Adam Kawa.
Repository: hadoop
Updated Branches:
refs/heads/branch-1 927f13b6c -> 3e3623818
MAPREDUCE-5660. Log info about possible thrashing (when using memory-based scheduling in Capacity Scheduler) is not printed. Contributed by Adam Kawa.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e362381
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e362381
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e362381
Branch: refs/heads/branch-1
Commit: 3e3623818142fdd9b643d2a72d2af66431b9122f
Parents: 927f13b
Author: Harsh J <ha...@cloudera.com>
Authored: Sun Mar 22 02:37:06 2015 +0530
Committer: Harsh J <ha...@cloudera.com>
Committed: Sun Mar 22 02:37:06 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/mapred/org/apache/hadoop/mapred/TaskTracker.java | 10 ++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e362381/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e6bfac1..b71eb08 100644
--- a/CHANGES.txt
+++ b/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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e362381/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
----------------------------------------------------------------------
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskTracker.java b/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
index a1ca352..3698eab 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
+++ b/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.");
}