You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ma...@apache.org on 2009/10/29 02:25:02 UTC
svn commit: r830821 - in /hadoop/mapreduce/trunk: CHANGES.txt
src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
Author: matei
Date: Thu Oct 29 01:25:01 2009
New Revision: 830821
URL: http://svn.apache.org/viewvc?rev=830821&view=rev
Log:
MAPREDUCE-1089. Fix NPE in fair scheduler preemption when tasks are
scheduled but not running. Contributed by Todd Lipcon.
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=830821&r1=830820&r2=830821&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Oct 29 01:25:01 2009
@@ -37,6 +37,9 @@
BUG FIXES
+ MAPREDUCE-1089. Fix NPE in fair scheduler preemption when tasks are
+ scheduled but not running. (Todd Lipcon via matei)
+
MAPREDUCE-1014. Fix the libraries for common and hdfs. (omalley)
MAPREDUCE-1111. JT Jetty UI not working if we run mumak.sh
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=830821&r1=830820&r2=830821&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 Thu Oct 29 01:25:01 2009
@@ -831,7 +831,11 @@
List<TaskStatus> statuses = new ArrayList<TaskStatus>();
for (TaskInProgress tip: tips) {
for (TaskAttemptID id: tip.getActiveTasks().keySet()) {
- statuses.add(tip.getTaskStatus(id));
+ TaskStatus stat = tip.getTaskStatus(id);
+ // status is null when the task has been scheduled but not yet running
+ if (stat != null) {
+ statuses.add(stat);
+ }
}
}
return statuses;