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 dd...@apache.org on 2008/09/19 13:34:17 UTC
svn commit: r697063 - in /hadoop/core/trunk: CHANGES.txt
src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
Author: ddas
Date: Fri Sep 19 04:34:16 2008
New Revision: 697063
URL: http://svn.apache.org/viewvc?rev=697063&view=rev
Log:
HADOOP-4213. Fixes NPE in TestLimitTasksPerJobTaskScheduler. Contributed by Sreekanth Ramakrishnan.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=697063&r1=697062&r2=697063&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Sep 19 04:34:16 2008
@@ -660,6 +660,9 @@
HistoryViewer for JobHistory fails. (Amareshwari Sri Ramadasu via
acmurthy)
+ HADOOP-4213. Fixes NPE in TestLimitTasksPerJobTaskScheduler.
+ (Sreekanth Ramakrishnan via ddas)
+
Release 0.18.1 - 2008-09-17
IMPROVEMENTS
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java?rev=697063&r1=697062&r2=697063&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java Fri Sep 19 04:34:16 2008
@@ -96,11 +96,14 @@
int maxReduceTasksPerTracker = 2;
List<JobInProgressListener> listeners =
new ArrayList<JobInProgressListener>();
+ QueueManager queueManager;
private Map<String, TaskTrackerStatus> trackers =
new HashMap<String, TaskTrackerStatus>();
public FakeTaskTrackerManager() {
+ JobConf conf = new JobConf();
+ queueManager = new QueueManager(conf);
trackers.put("tt1", new TaskTrackerStatus("tt1", "tt1.host", 1,
new ArrayList<TaskStatus>(), 0,
maxMapTasksPerTracker, maxReduceTasksPerTracker));
@@ -141,7 +144,7 @@
@Override
public QueueManager getQueueManager() {
- return null;
+ return queueManager;
}
@Override