Repository: ambari Updated Branches: refs/heads/trunk 4b63b0958 -> 088da07d4
AMBARI-7739. hive command line fails to start after setting hive.execution.engine to tez in HDP 2.2.1 (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/088da07d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/088da07d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/088da07d Branch: refs/heads/trunk Commit: 088da07d45e4f89561266b07c2b301c10bdb2df4 Parents: 4b63b09 Author: Alejandro Fernandez <[email protected]> Authored: Tue Oct 14 17:46:10 2014 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Tue Oct 14 18:11:08 2014 -0700 ---------------------------------------------------------------------- .../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/088da07d/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml index 5d70420..70e175a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml @@ -174,9 +174,13 @@ done MAPREDUCE_LIBS={{mapreduce_libs_path}} export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS} -if [[ -d "/usr/hdp/current/tez-client" && -d "/etc/tez/conf/" ]]; then - # When using versioned RPMs, the tez-client will be a symlink to the current folder of tez in HDP. - export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:/usr/hdp/current/tez-client/*:/usr/hdp/current/tez-client/lib/*:/etc/tez/conf/ +# TODO, once Ambari 1.7.0 properly supports versioned RPMs stored in HDFS, Ambari will no longer need these +# added to the HADOOP_CLASSPATH +if [ -d "/usr/hdp/current/tez-client" ]; then + if [ -d "/etc/tez/conf/" ]; then + # When using versioned RPMs, the tez-client will be a symlink to the current folder of tez in HDP. + export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:/usr/hdp/current/tez-client/*:/usr/hdp/current/tez-client/lib/*:/etc/tez/conf/ + fi fi # Setting path to hdfs command line
