Author: harsh
Date: Tue Mar 13 21:31:20 2012
New Revision: 1300361
URL: http://svn.apache.org/viewvc?rev=1300361&view=rev
Log:
MAPREDUCE-4001. Improve MAPREDUCE-3789's fix logic by looking at job's slot
demands instead. (harsh)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1300361&r1=1300360&r2=1300361&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Mar 13 21:31:20 2012
@@ -161,6 +161,8 @@ Release 1.1.0 - unreleased
HDFS-2872. Add sanity checks during edits loading that generation
stamps are non-decreasing. (Colin Patrick McCabe via eli)
+ MAPREDUCE-4001. Improve MAPREDUCE-3789's fix logic by looking at job's
slot demands instead. (harsh)
+
Release 1.0.2 - unreleased
NEW FEATURES
Modified:
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java?rev=1300361&r1=1300360&r2=1300361&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
(original)
+++
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
Tue Mar 13 21:31:20 2012
@@ -344,7 +344,7 @@ class CapacityTaskScheduler extends Task
// starved
if ((getPendingTasks(j) != 0 &&
!hasSufficientReservedTaskTrackers(j)) &&
- (taskTracker.getAvailableSlots(type) !=
+ !(j.getNumSlotsPerTask(type) >
getTTMaxSlotsForType(taskTrackerStatus, type))) {
// Reserve all available slots on this tasktracker
LOG.info(j.getJobID() + ": Reserving "
