You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/02/04 04:16:40 UTC

git commit: TEZ-775. Fix usage of env vars (bikas)

Updated Branches:
  refs/heads/master 22b9c892c -> 847068a50


TEZ-775. Fix usage of env vars (bikas)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/847068a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/847068a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/847068a5

Branch: refs/heads/master
Commit: 847068a50fe9c698bdfe0cdc33d5d4bba530db58
Parents: 22b9c89
Author: Bikas Saha <bi...@apache.org>
Authored: Mon Feb 3 19:16:23 2014 -0800
Committer: Bikas Saha <bi...@apache.org>
Committed: Mon Feb 3 19:16:23 2014 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/tez/mapreduce/processor/MRTask.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/847068a5/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
index db7aea9..87c7912 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
@@ -224,7 +224,9 @@ public abstract class MRTask {
   private void configureLocalDirs() throws IOException {
     // TODO NEWTEZ Is most of this functionality required ?
     jobConf.setStrings(TezJobConfig.LOCAL_DIRS, processorContext.getWorkDirs());
-    jobConf.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, System.getenv(Environment.PWD.name()));
+    if (jobConf.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR) == null) {
+      jobConf.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, System.getenv(Environment.PWD.name()));
+    }
 
     jobConf.setStrings(MRConfig.LOCAL_DIR, processorContext.getWorkDirs());