svn commit: r918864 - in /hadoop/mapreduce/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/Child.java

[cd...@apache.org]

Author: cdouglas
Date: Thu Mar  4 06:15:51 2010
New Revision: 918864

URL: http://svn.apache.org/viewvc?rev=918864&view=rev
Log:
MAPREDUCE-1520. Fix TestMiniMRLocalFS failure caused by regression in
getting user working dir. Contributed by Amareshwari Sriramadasu

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Child.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=918864&r1=918863&r2=918864&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Mar  4 06:15:51 2010
@@ -406,6 +406,9 @@
     MAPREDUCE-1421. Fix the LinuxTaskController tests failing on trunk after
     the commit of MAPREDUCE-1385. (Amareshwari Sriramadasu via vinodkv)
 
+    MAPREDUCE-1520. Fix TestMiniMRLocalFS failure caused by regression in
+    getting user working dir. (Amareshwari Sriramadasu via cdouglas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Child.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Child.java?rev=918864&r1=918863&r2=918864&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Child.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Child.java Thu Mar  4 06:15:51 2010
@@ -199,8 +199,6 @@
 
         // 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.
@@ -214,6 +212,8 @@
           @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);