ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-5744. HADOOP_HOME is not set in hadoop-env.sh (aonishuk)
Date Wed, 14 May 2014 16:08:48 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk d1e53b326 -> 0ec758ae6


AMBARI-5744. HADOOP_HOME is not set in hadoop-env.sh (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ec758ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ec758ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ec758ae

Branch: refs/heads/trunk
Commit: 0ec758ae6622af9188bab2a8b7b689864792d98b
Parents: d1e53b3
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue May 13 21:04:10 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Wed May 14 19:08:37 2014 +0300

----------------------------------------------------------------------
 .../HDP/1.3.2/hooks/after-INSTALL/templates/hadoop-env.sh.j2      | 3 +++
 .../HDP/2.0.6/hooks/before-START/templates/hadoop-env.sh.j2       | 3 +++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ec758ae/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/templates/hadoop-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/templates/hadoop-env.sh.j2
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/templates/hadoop-env.sh.j2
index 1e61406..cf69efa 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/templates/hadoop-env.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/templates/hadoop-env.sh.j2
@@ -49,6 +49,9 @@ export HADOOP_HOME_WARN_SUPPRESS=1
 #TODO: if env var set that can cause problems
 export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}}
 
+# Hadoop home directory
+export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
+
 # this is different for HDP1 #
 # Path to jsvc required by secure HDP 2.0 datanode
 # export JSVC_HOME={{jsvc_path}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ec758ae/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 ebf4263..c55a5f7 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
@@ -45,6 +45,9 @@
 export JAVA_HOME={{java_home}}
 export HADOOP_HOME_WARN_SUPPRESS=1
 
+# Hadoop home directory
+export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
+
 # Hadoop Configuration Directory
 #TODO: if env var set that can cause problems
 export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}}


Mime
View raw message