Repository: ambari Updated Branches: refs/heads/trunk 0d2a34daa -> c5e09dadb
AMBARI-7710 HADOOP_HOME pointing to incorrect path (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c5e09dad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c5e09dad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c5e09dad Branch: refs/heads/trunk Commit: c5e09dadbfda5472d403277681275c391d55c26c Parents: 0d2a34d Author: Dmytro Sen <[email protected]> Authored: Thu Oct 9 18:04:53 2014 +0300 Committer: Dmytro Sen <[email protected]> Committed: Thu Oct 9 18:21:56 2014 +0300 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 2 ++ .../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c5e09dad/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index 8962beb..778dd17 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -39,9 +39,11 @@ rpm_version = default("/configurations/cluster-env/rpm_version", None) if rpm_version: mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*" hadoop_libexec_dir = "/usr/hdp/current/hadoop/libexec" + hadoop_home = "/usr/hdp/current/hadoop" else: mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*" hadoop_libexec_dir = "/usr/lib/hadoop/libexec" + hadoop_home = "/usr/lib/hadoop" hadoop_conf_dir = "/etc/hadoop/conf" hadoop_conf_empty_dir = "/etc/hadoop/conf.empty" http://git-wip-us.apache.org/repos/asf/ambari/blob/c5e09dad/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 aa88b82..93ad95d 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 @@ -91,7 +91,7 @@ export JAVA_HOME={{java_home}} export HADOOP_HOME_WARN_SUPPRESS=1 # Hadoop home directory -export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop} +export HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}} # Hadoop Configuration Directory #TODO: if env var set that can cause problems
