Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 30093 invoked from network); 6 Sep 2010 03:39:05 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Sep 2010 03:39:05 -0000 Received: (qmail 5561 invoked by uid 500); 6 Sep 2010 03:39:05 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 5475 invoked by uid 500); 6 Sep 2010 03:39:02 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 5467 invoked by uid 99); 6 Sep 2010 03:39:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Sep 2010 03:39:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Sep 2010 03:38:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 90F5323889B2; Mon, 6 Sep 2010 03:38:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 06 Sep 2010 03:38:37 -0000 To: mapreduce-commits@hadoop.apache.org From: amareshwari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100906033837.90F5323889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);