Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 3312 invoked from network); 1 Apr 2009 22:02:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Apr 2009 22:02:10 -0000 Received: (qmail 72239 invoked by uid 500); 1 Apr 2009 22:02:09 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 72177 invoked by uid 500); 1 Apr 2009 22:02:09 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 72168 invoked by uid 99); 1 Apr 2009 22:02:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 22:02:09 +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; Wed, 01 Apr 2009 22:02:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF50F2388A36; Wed, 1 Apr 2009 22:01:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761083 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobInProgress.java Date: Wed, 01 Apr 2009 22:01:48 -0000 To: core-commits@hadoop.apache.org From: cdouglas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090401220148.CF50F2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdouglas Date: Wed Apr 1 22:01:48 2009 New Revision: 761083 URL: http://svn.apache.org/viewvc?rev=761083&view=rev Log: HADOOP-5607. Fix NPE in TestCapacityScheduler. Modified: hadoop/core/branches/branch-0.20/CHANGES.txt hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Modified: hadoop/core/branches/branch-0.20/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=761083&r1=761082&r2=761083&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Apr 1 22:01:48 2009 @@ -832,6 +832,8 @@ the running job's information printed to the user's stdout as it runs. (omalley) + HADOOP-5607. Fix NPE in TestCapacityScheduler. (cdouglas) + Release 0.19.2 - Unreleased BUG FIXES Modified: hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=761083&r1=761082&r2=761083&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original) +++ hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Wed Apr 1 22:01:48 2009 @@ -95,7 +95,7 @@ private volatile boolean jobFailed = false; JobPriority priority = JobPriority.NORMAL; - JobTracker jobtracker = null; + final JobTracker jobtracker; // NetworkTopology Node to the set of TIPs Map> nonRunningMapCache; @@ -213,6 +213,7 @@ this.numReduceTasks = conf.getNumReduceTasks(); this.maxLevel = NetworkTopology.DEFAULT_HOST_LEVEL; this.anyCacheLevel = this.maxLevel+1; + this.jobtracker = null; } /** @@ -2117,7 +2118,6 @@ } private synchronized void terminateJob(int jobTerminationState) { - final JobTrackerInstrumentation metrics = jobtracker.getInstrumentation(); if ((status.getRunState() == JobStatus.RUNNING) || (status.getRunState() == JobStatus.PREP)) { if (jobTerminationState == JobStatus.FAILED) { @@ -2138,7 +2138,8 @@ this.finishedReduceTasks); } garbageCollect(); - metrics.terminateJob(this.conf, this.status.getJobID()); + jobtracker.getInstrumentation().terminateJob( + this.conf, this.status.getJobID()); } }