Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 50028 invoked from network); 4 Mar 2011 04:44:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 04:44:57 -0000 Received: (qmail 3849 invoked by uid 500); 4 Mar 2011 04:44:57 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 3823 invoked by uid 500); 4 Mar 2011 04:44:57 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 3780 invoked by uid 99); 4 Mar 2011 04:44:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:44:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 04 Mar 2011 04:44:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 47E942388C1F; Fri, 4 Mar 2011 04:44:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077687 - in /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop: filecache/TrackerDistributedCacheManager.java mapred/TaskTracker.java Date: Fri, 04 Mar 2011 04:44:34 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304044434.47E942388C1F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 04:44:33 2011 New Revision: 1077687 URL: http://svn.apache.org/viewvc?rev=1077687&view=rev Log: commit cb490404e85f8f47ece6b3d6594a8fe4f206f528 Author: Owen O'Malley Date: Fri Sep 17 15:28:26 2010 -0700 release dc objects when jobs retire Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java?rev=1077687&r1=1077686&r2=1077687&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java Fri Mar 4 04:44:33 2011 @@ -687,14 +687,6 @@ public class TrackerDistributedCacheMana return result; } - public void releaseJob(JobID jobId) throws IOException { - TaskDistributedCacheManager mgr = jobArchives.get(jobId); - if (mgr != null) { - mgr.release(); - jobArchives.remove(jobId); - } - } - public void setArchiveSizes(JobID jobId, long[] sizes) throws IOException { TaskDistributedCacheManager mgr = jobArchives.get(jobId); if (mgr != null) { Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1077687&r1=1077686&r2=1077687&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Fri Mar 4 04:44:33 2011 @@ -1702,7 +1702,9 @@ public class TaskTracker implements MRCo if (rjob == null) { LOG.warn("Unknown job " + jobId + " being deleted."); } else { - synchronized (rjob) { + synchronized (rjob) { + // decrement the reference counts for the items this job references + rjob.distCacheMgr.release(); // Add this tips of this job to queue of tasks to be purged for (TaskInProgress tip : rjob.tasks) { tip.jobHasFinished(false);