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 om...@apache.org on 2011/03/04 04:28:13 UTC
svn commit: r1076986 -
/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Author: omalley
Date: Fri Mar 4 03:28:13 2011
New Revision: 1076986
URL: http://svn.apache.org/viewvc?rev=1076986&view=rev
Log:
commit aefa71dfa58406b966e0217b729f17a7a988bf28
Author: Yahoo\! <lt...@yahoo-inc.com>
Date: Mon Aug 24 10:29:29 2009 -0700
Fix an merge issue caused by MAPREDUCE-832 by applying this patch:
http://issues.apache.org/jira/secure/attachment/12417453/mapreduce-834-ydist.patch
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1076986&r1=1076985&r2=1076986&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Fri Mar 4 03:28:13 2011
@@ -3169,8 +3169,8 @@ public class TaskTracker
"It shouldn't be greater than task limits");
totalMemoryAllottedForTasks = JobConf.DISABLED_MEMORY_LIMIT;
} else {
- totalMemoryAllottedForTasks = (maxCurrentMapTasks +
- maxCurrentReduceTasks) * (memoryAllotedForSlot/(1024 * 1024));
+ totalMemoryAllottedForTasks = (maxMapSlots +
+ maxReduceSlots) * (memoryAllotedForSlot/(1024 * 1024));
}
}
}