You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ey...@apache.org on 2012/12/15 00:31:44 UTC

svn commit: r1422149 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java

Author: eyang
Date: Fri Dec 14 23:31:41 2012
New Revision: 1422149

URL: http://svn.apache.org/viewvc?rev=1422149&view=rev
Log:
MAPREDUCE-4396. Port support private distributed cache to
LocalJobRunner from branch-1-win. (Yu Gao via eyang)

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1422149&r1=1422148&r2=1422149&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Dec 14 23:31:41 2012
@@ -142,6 +142,12 @@ Release 1.2.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-4396. Port support private distributed cache to 
+    LocalJobRunner from branch-1-win. (Yu Gao via eyang)
+
+    MAPREDUCE-4798. Updated TestJobHistoryServer test case for startup
+    race conditions.  (Sam Liu via eyang)
+
     HADOOP-8418. Update UGI Principal classes name for running with
     IBM JDK on 64 bits Windows.  (Yu Gao via eyang)
 

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java?rev=1422149&r1=1422148&r2=1422149&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java Fri Dec 14 23:31:41 2012
@@ -122,6 +122,8 @@ class LocalJobRunner implements JobSubmi
         trackerDistributedCacheManager.newTaskDistributedCacheManager(
             jobid, conf);
       taskDistributedCacheManager.setupCache(conf, "archive", "archive");
+      // Localize private distributed cache
+      JobLocalizer.downloadPrivateCache(conf);
       
       if (DistributedCache.getSymlink(conf)) {
         // This is not supported largely because,