You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2017/02/17 22:57:00 UTC
[22/51] [abbrv] ambari git commit: AMBARI-19733: Regression in Spark2
keytab and {{stack_root}} for Livy2 (Bikas Saha via jluniya)
AMBARI-19733: Regression in Spark2 keytab and {{stack_root}} for Livy2 (Bikas Saha via jluniya)
(cherry picked from commit 2ccee3d2617f1e620dac49ced5414697d9928555)
Change-Id: If563b8e55258c2c3ba1d2e86e0874cfdf762de10
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd2674d5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd2674d5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd2674d5
Branch: refs/heads/branch-feature-BUG-74026
Commit: bd2674d50e6ab86ac2b47e64323a978f2dac814a
Parents: d1c34a9
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Wed Feb 1 21:54:08 2017 -0800
Committer: Zuul <re...@hortonworks.com>
Committed: Tue Feb 7 02:09:48 2017 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml | 2 +-
.../main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd2674d5/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
index afb1d17..6ba9141 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
@@ -61,7 +61,7 @@
</property>
<property>
<name>spark_home</name>
- <value>{{stack_root}}/current/spark2-client</value>
+ <value>/usr/hdp/current/spark2-client</value>
<value-attributes>
<type>directory</type>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd2674d5/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
index 6b5b053..01ee87e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
@@ -15,7 +15,7 @@
"local_username" : "${spark2-env/spark_user}"
},
"keytab": {
- "file": "${keytab_dir}/spark.headless.keytab",
+ "file": "${keytab_dir}/spark2.headless.keytab",
"owner": {
"name": "${spark2-env/spark_user}",
"access": "r"
@@ -96,7 +96,7 @@
"local_username": "${livy2-env/livy2_user}"
},
"keytab": {
- "file": "${keytab_dir}/livy.service.keytab",
+ "file": "${keytab_dir}/livy2.service.keytab",
"owner": {
"name": "${livy2-env/livy2_user}",
"access": "r"