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 am...@apache.org on 2010/09/06 05:38:37 UTC
svn commit: r992931 - in /hadoop/mapreduce/trunk: CHANGES.txt
src/java/org/apache/hadoop/mapred/TaskTracker.java
src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncher.java
src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java
Author: amareshwari
Date: Mon Sep 6 03:38:36 2010
New Revision: 992931
URL: http://svn.apache.org/viewvc?rev=992931&view=rev
Log:
MAPREDUCE-2031. Fixes test failures TestTaskLauncher and TestTaskTrackerLocalization. Contributed by Ravi Gummadi
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncher.java
hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=992931&r1=992930&r2=992931&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Sep 6 03:38:36 2010
@@ -274,6 +274,9 @@ Trunk (unreleased changes)
MAPREDUCE-2023. TestDFSIO should not stop reading if curSize != bufferSize.
(Hong Tang via szetszwo)
+ MAPREDUCE-2031. Fixes test failures TestTaskLauncher and
+ TestTaskTrackerLocalization. (Ravi Gummadi via amareshwari)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=992931&r1=992930&r2=992931&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java Mon Sep 6 03:38:36 2010
@@ -379,7 +379,13 @@ public class TaskTracker
public TaskTrackerInstrumentation getTaskTrackerInstrumentation() {
return myInstrumentation;
}
-
+
+ // Currently used only in tests
+ void setTaskTrackerInstrumentation(
+ TaskTrackerInstrumentation trackerInstrumentation) {
+ myInstrumentation = trackerInstrumentation;
+ }
+
/**
* A list of tips that should be cleaned up.
*/
Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncher.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncher.java?rev=992931&r1=992930&r2=992931&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncher.java (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncher.java Mon Sep 6 03:38:36 2010
@@ -64,7 +64,11 @@ public class TestTaskLauncher {
tt.setConf(ttConf);
tt.setIndexCache(new IndexCache(ttConf));
tt.setTaskMemoryManagerEnabledFlag();
-
+
+ // Set up TaskTracker instrumentation
+ tt.setTaskTrackerInstrumentation(
+ TaskTracker.createInstrumentation(tt, tt.getJobConf()));
+
// start map-task launcher with four slots
TaskLauncher mapLauncher = tt.new TaskLauncher(TaskType.MAP, 4);
mapLauncher.start();
Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java?rev=992931&r1=992930&r2=992931&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java Mon Sep 6 03:38:36 2010
@@ -188,6 +188,10 @@ public class TestTaskTrackerLocalization
tracker.setAsyncDiskService(new MRAsyncDiskService(trackerFConf));
tracker.getAsyncDiskService().cleanupAllVolumes();
+ // Set up TaskTracker instrumentation
+ tracker.setTaskTrackerInstrumentation(
+ TaskTracker.createInstrumentation(tracker, trackerFConf));
+
// setup task controller
taskController = createTaskController();
taskController.setConf(trackerFConf);