Pārlūkot izejas kodu

HADOOP-5704. Fix compilation problems in TestFairScheduler and TestCapacityScheduler. Contributed by Chris Douglas

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@766181 13f79535-47bb-0310-9956-ffa450edef68
Tsz-wo Sze 16 gadi atpakaļ
vecāks
revīzija
0e8f11d9a7

+ 3 - 0
CHANGES.txt

@@ -415,6 +415,9 @@ Trunk (unreleased changes)
     HADOOP-5661. Fixes some findbugs warnings in o.a.h.mapred* packages and supresses
     a bunch of them. (Jothi Padmanabhan via ddas)
 
+    HADOOP-5704. Fix compilation problems in TestFairScheduler and
+    TestCapacityScheduler.  (Chris Douglas via szetszwo)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 3 - 1
src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java

@@ -305,6 +305,7 @@ public class TestCapacityScheduler extends TestCase {
     int reduces = 0;
     int maxMapTasksPerTracker = 2;
     int maxReduceTasksPerTracker = 1;
+    long ttExpiryInterval = 10 * 60 * 1000L; // default interval
     List<JobInProgressListener> listeners =
       new ArrayList<JobInProgressListener>();
     FakeQueueManager qm = new FakeQueueManager();
@@ -340,7 +341,8 @@ public class TestCapacityScheduler extends TestCase {
     
     public ClusterStatus getClusterStatus() {
       int numTrackers = trackers.size();
-      return new ClusterStatus(numTrackers, maps, reduces,
+      return new ClusterStatus(numTrackers, 0,
+          ttExpiryInterval, maps, reduces,
           numTrackers * maxMapTasksPerTracker,
           numTrackers * maxReduceTasksPerTracker,
           JobTracker.State.RUNNING);

+ 4 - 1
src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java

@@ -105,6 +105,7 @@ public class TestFairScheduler extends TestCase {
     int reduces = 0;
     int maxMapTasksPerTracker = 2;
     int maxReduceTasksPerTracker = 2;
+    long ttExpiryInterval = 10 * 60 * 1000L; // default interval
     List<JobInProgressListener> listeners =
       new ArrayList<JobInProgressListener>();
     
@@ -125,7 +126,9 @@ public class TestFairScheduler extends TestCase {
     @Override
     public ClusterStatus getClusterStatus() {
       int numTrackers = trackers.size();
-      return new ClusterStatus(numTrackers, maps, reduces,
+
+      return new ClusterStatus(numTrackers, 0,
+          ttExpiryInterval, maps, reduces,
           numTrackers * maxMapTasksPerTracker,
           numTrackers * maxReduceTasksPerTracker,
           JobTracker.State.RUNNING);