Author: shv
Date: Fri Feb 4 22:55:17 2011
New Revision: 1067321
URL: http://svn.apache.org/viewvc?rev=1067321&view=rev
Log:
MAPREDUCE-1974. Fix multiple preemtions of the same task in FairScheduler.
Contributed by Scott Chen.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1067321&r1=1067320&r2=1067321&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Feb 4 22:55:17 2011
@@ -541,6 +541,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-1915. Fix IndexOutOfBoundsException in IndexCache.
(Priyo Mustafi via shv)
+ MAPREDUCE-1974. Fix multiple preemtions of the same task in FairScheduler.
+ (Scott Chen via shv)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Modified:
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java?rev=1067321&r1=1067320&r2=1067321&view=diff
==============================================================================
---
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
(original)
+++
hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
Fri Feb 4 22:55:17 2011
@@ -924,7 +924,7 @@ public class FairScheduler extends TaskS
private List<TaskStatus> getRunningTasks(JobInProgress job, TaskType type) {
// Create a list of all running TaskInProgress'es in the job
- List<TaskInProgress> tips = new ArrayList<TaskInProgress>();
+ Set<TaskInProgress> tips = new HashSet<TaskInProgress>();
if (type == TaskType.MAP) {
// Jobs may have both "non-local maps" which have a split with no
locality
// info (e.g. the input file is not in HDFS), and maps with locality
info,
