Selaa lähdekoodia

MAPREDUCE-3405. Fix compilation in contrib tests broken by commit of MAPREDUCE-3015. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1202434 13f79535-47bb-0310-9956-ffa450edef68
Todd Lipcon 13 vuotta sitten
vanhempi
commit
40a3d30d17

+ 3 - 0
CHANGES.txt

@@ -29,6 +29,9 @@ Release 0.20.206.0 - unreleased
     HADOOP-7629. Allow immutable FsPermission objects to be used as IPC
     parameters. (todd)
 
+    MAPREDUCE-3405. Fix compilation in contrib tests broken by commit
+    of MAPREDUCE-3015. (todd)
+
   IMPROVEMENTS
 
     MAPREDUCE-2836. Provide option to fail jobs when submitted to

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

@@ -472,7 +472,7 @@ public class TestCapacityScheduler extends TestCase {
         String ttName = "tt" + i;
         TaskTracker tt = new TaskTracker(ttName);
         tt.setStatus(new TaskTrackerStatus(ttName, ttName + ".host", i,
-                                           new ArrayList<TaskStatus>(), 0, 
+                                           new ArrayList<TaskStatus>(), 0, 0,
                                            maxMapTasksPerTracker,
                                            maxReduceTasksPerTracker));
         trackers.put(ttName, tt);
@@ -482,7 +482,7 @@ public class TestCapacityScheduler extends TestCase {
     public void addTaskTracker(String ttName) {
       TaskTracker tt = new TaskTracker(ttName);
       tt.setStatus(new TaskTrackerStatus(ttName, ttName + ".host", 1,
-                                         new ArrayList<TaskStatus>(), 0,
+                                         new ArrayList<TaskStatus>(), 0, 0,
                                          maxMapTasksPerTracker, 
                                          maxReduceTasksPerTracker));
       trackers.put(ttName, tt);

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

@@ -67,7 +67,7 @@ public class TestCapBasedLoadManager extends TestCase {
       ts.add(getRunningReduceTaskStatus());
     }
     TaskTrackerStatus tracker = new TaskTrackerStatus("tracker", 
-        "tracker_host", 1234, ts, 0, mapCap, reduceCap);
+        "tracker_host", 1234, ts, 0, 0, mapCap, reduceCap);
     return tracker;
   }
 

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

@@ -377,7 +377,7 @@ public class TestFairScheduler extends TestCase {
           System.out.println("Creating TaskTracker tt" + id + " on " + host);
           TaskTracker tt = new TaskTracker("tt" + id);
           tt.setStatus(new TaskTrackerStatus("tt" + id, host, 0,
-              new ArrayList<TaskStatus>(), 0,
+              new ArrayList<TaskStatus>(), 0, 0,
               maxMapTasksPerTracker, maxReduceTasksPerTracker));
           trackers.put("tt" + id, tt);
         }