You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/02/20 19:25:30 UTC
git commit: AMBARI-4766. Tez jar should be uploaded the HDFS and he
hadoop-env should have tez libraries in the classpath. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk a864232ed -> 8e538edf8
AMBARI-4766. Tez jar should be uploaded the HDFS and he hadoop-env should have tez libraries in the classpath. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e538edf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e538edf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e538edf
Branch: refs/heads/trunk
Commit: 8e538edf8e3d6081e877a6853dc0498466d6d9c1
Parents: a864232
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Feb 20 10:11:01 2014 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Feb 20 10:11:01 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2 | 2 +-
.../stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py | 2 --
.../stacks/HDP/2.1.1/services/TEZ/package/templates/tez-env.sh.j2 | 2 --
3 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e538edf/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2
index 1f596a3..f594795 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2
@@ -115,7 +115,7 @@ MAPREDUCE_LIBS={{mapreduce_libs_path}}
export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}
if [ -d "/usr/lib/tez" ]; then
- export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/usr/lib/tez/*:/usr/lib/tez/lib/*
+ export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/usr/lib/tez/*:/usr/lib/tez/lib/*:/etc/tez/conf
fi
# Setting path to hdfs command line
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e538edf/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
index 203fc66..c35f7be 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
@@ -24,8 +24,6 @@ from resource_management import *
config = Script.get_config()
conf_dir = "/etc/tez/conf"
-pid_dir = default('/configurations/global/tez_pid_dir', '/var/run/hadoop-tez/')
-log_dir = default('/configurations/global/tez_log_dir', '/var/log/hadoop-tez/')
hadoop_home = '/usr'
java64_home = config['hostLevelParams']['java_home']
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e538edf/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/templates/tez-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/templates/tez-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/templates/tez-env.sh.j2
index 6fbadff..49a40e1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/templates/tez-env.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/templates/tez-env.sh.j2
@@ -14,8 +14,6 @@
# limitations under the License.
# Tez specific configuration
-export TEZ_LOG_DIR={{log_dir}}
-export TEZ_PID_DIR={{pid_dir}}
export TEZ_CONF_DIR={{conf_dir}}
# Set HADOOP_HOME to point to a specific hadoop install directory