ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: AMBARI-7710 HADOOP_HOME pointing to incorrect path (dsen)
Date Thu, 09 Oct 2014 15:27:26 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 87f687c36 -> d9a0474a6


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

Branch: refs/heads/branch-1.7.0
Commit: d9a0474a67d2cdbca9be12686f006d40d0b8ccd3
Parents: 87f687c
Author: Dmytro Sen <dsen@hortonworks.com>
Authored: Thu Oct 9 18:27:04 2014 +0300
Committer: Dmytro Sen <dsen@hortonworks.com>
Committed: Thu Oct 9 18:27:04 2014 +0300

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py          | 4 +++-
 .../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a0474a/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..2a00777 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"
@@ -134,4 +136,4 @@ if has_nagios:
   user_to_gid_dict[nagios_user] = nagios_group
 
 user_list = json.loads(config['hostLevelParams']['user_list'])
-group_list = json.loads(config['hostLevelParams']['group_list'])
\ No newline at end of file
+group_list = json.loads(config['hostLevelParams']['group_list'])

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a0474a/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..4d0e68f 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
@@ -189,4 +189,4 @@ export HADOOP_ROOT_LOGGER={{hadoop_root_logger}}
     </value>
   </property>
   
-</configuration>
\ No newline at end of file
+</configuration>


Mime
View raw message