You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2014/08/01 04:12:43 UTC
git commit: TEZ-1352. HADOOP_CONF_DIR should be in the classpath for
containers. (sseth)
Repository: tez
Updated Branches:
refs/heads/master 020872ae1 -> 25960cc27
TEZ-1352. HADOOP_CONF_DIR should be in the classpath for containers.
(sseth)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/25960cc2
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/25960cc2
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/25960cc2
Branch: refs/heads/master
Commit: 25960cc277e40ed0c926a3cb75122c6dac0181a0
Parents: 020872a
Author: Siddharth Seth <ss...@apache.org>
Authored: Thu Jul 31 19:12:26 2014 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Thu Jul 31 19:12:26 2014 -0700
----------------------------------------------------------------------
tez-api/src/main/java/org/apache/tez/common/TezYARNUtils.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/25960cc2/tez-api/src/main/java/org/apache/tez/common/TezYARNUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/TezYARNUtils.java b/tez-api/src/main/java/org/apache/tez/common/TezYARNUtils.java
index 72be2ba..87ff828 100644
--- a/tez-api/src/main/java/org/apache/tez/common/TezYARNUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/common/TezYARNUtils.java
@@ -18,7 +18,6 @@
package org.apache.tez.common;
import java.io.File;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
@@ -56,6 +55,7 @@ public class TezYARNUtils {
Environment.PWD.$() + File.separator + "*",
File.pathSeparator);
+ // Next add the tez libs, if specified via an archive.
if (usingArchive) {
TezYARNUtils.addToEnvironment(environment, Environment.CLASSPATH.name(),
Environment.PWD.$() + File.separator +
@@ -67,6 +67,7 @@ public class TezYARNUtils {
File.pathSeparator);
}
+ // Last add HADOOP_CLASSPATH, if it's required.
if (conf.getBoolean(TezConfiguration.TEZ_USE_CLUSTER_HADOOP_LIBS,
TezConfiguration.TEZ_USE_CLUSTER_HADOOP_LIBS_DEFAULT)) {
for (String c : conf.getStrings(
@@ -75,6 +76,10 @@ public class TezYARNUtils {
TezYARNUtils.addToEnvironment(environment, Environment.CLASSPATH.name(),
c.trim(), File.pathSeparator);
}
+ } else {
+ // Setup HADOOP_CONF_DIR after PWD and tez-libs, if it's required.
+ TezYARNUtils.addToEnvironment(environment, Environment.CLASSPATH.name(),
+ Environment.HADOOP_CONF_DIR.$(), File.pathSeparator);
}
return StringInterner.weakIntern(environment.get(Environment.CLASSPATH.name()));
}