ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject git commit: AMBARI-7739. hive command line fails to start after setting hive.execution.engine to tez in HDP 2.2.1 (alejandro)
Date Wed, 15 Oct 2014 01:17:36 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 1938c1b07 -> 2eb0c1d3f


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/2eb0c1d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2eb0c1d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2eb0c1d3

Branch: refs/heads/branch-1.7.0
Commit: 2eb0c1d3f6bfbabec7d1b947a8b8e3bafe765735
Parents: 1938c1b
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Tue Oct 14 18:17:18 2014 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Tue Oct 14 18:17:18 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/2eb0c1d3/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 984897f..c42fff7 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


Mime
View raw message