AMBARI-18072. set JAVA_HOME in livy-env.sh (Jeff Zhang via smohanty)

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']

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}}