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 om...@apache.org on 2011/03/04 04:52:29 UTC

svn commit: r1077213 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Child.java

Author: omalley
Date: Fri Mar  4 03:52:29 2011
New Revision: 1077213

URL: http://svn.apache.org/viewvc?rev=1077213&view=rev
Log:
commit 0796ec7d19d347b652c9017471c9743d7ff6e20b
Author: Devaraj Das <dd...@yahoo-inc.com>
Date:   Tue Feb 23 18:04:41 2010 -0800

    MAPREDUCE:1520 from https://issues.apache.org/jira/secure/attachment/12436695/patch-1520-20S.txt
    
    +++ b/YAHOO-CHANGES.txt
    +    MAPREDUCE-1520. Moves a call to setWorkingDirectory in Child to within
    +    a doAs block. (Amareshwari Sriramadasu via ddas)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Child.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Child.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Child.java?rev=1077213&r1=1077212&r2=1077213&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Child.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Child.java Fri Mar  4 03:52:29 2011
@@ -193,8 +193,6 @@ class Child {
 
         // Initiate Java VM metrics
         JvmMetrics.init(task.getPhase().toString(), job.getSessionId());
-        // use job-specified working directory
-        FileSystem.get(job).setWorkingDirectory(job.getWorkingDirectory());
         LOG.debug("Creating remote user to execute task: " + job.get("user.name"));
         childUGI = UserGroupInformation.createRemoteUser(job.get("user.name"));
         // Add tokens to new user so that it may execute its task correctly.
@@ -208,6 +206,8 @@ class Child {
           @Override
           public Object run() throws Exception {
             try {
+              // use job-specified working directory
+              FileSystem.get(job).setWorkingDirectory(job.getWorkingDirectory());
               taskFinal.run(job, umbilical);             // run the task
             } finally {
               TaskLog.syncLogs(firstTaskid, taskid, isCleanup);