hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
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 GMT
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 <omalley@apache.org>
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);



Mime
View raw message