You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/08/11 14:15:48 UTC
ambari git commit: AMBARI-18072. set JAVA_HOME in livy-env.sh (Jeff
Zhang via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 89cfd2a93 -> 1d4a4b73d
AMBARI-18072. set JAVA_HOME in livy-env.sh (Jeff Zhang via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d4a4b73
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d4a4b73
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d4a4b73
Branch: refs/heads/branch-2.4
Commit: 1d4a4b73de5db75ae95073fc7402dab097073686
Parents: 89cfd2a
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Aug 11 07:15:08 2016 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Aug 11 07:15:08 2016 -0700
----------------------------------------------------------------------
.../common-services/SPARK/1.2.1/package/scripts/params.py | 2 +-
.../stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d4a4b73/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index 5a14ad1..0e09063 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -53,7 +53,7 @@ config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
upgrade_direction = default("/commandParams/upgrade_direction", None)
-
+java_home = config['hostLevelParams']['java_home']
stack_name = status_params.stack_name
stack_root = Script.get_stack_root()
stack_version_unformatted = config['hostLevelParams']['stack_version']
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d4a4b73/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml
index c2e6c93..fee24bb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml
@@ -80,6 +80,7 @@
# - LIVY_PID_DIR Where the pid file is stored. (Default: /tmp)
# - LIVY_SERVER_JAVA_OPTS Java Opts for running livy server (You can set jvm related setting here, like jvm memory/gc algorithm and etc.)
export SPARK_HOME=/usr/hdp/current/spark-client
+ export JAVA_HOME={{java_home}}
export HADOOP_CONF_DIR=/etc/hadoop/conf
export LIVY_LOG_DIR={{livy_log_dir}}
export LIVY_PID_DIR={{livy_pid_dir}}