You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by db...@apache.org on 2016/06/20 20:57:19 UTC
ambari git commit: AMBARI-17316 [Zeppelin][Ambari] Service restart
fails if one modifies the parameter zeppelin_log_dir. (Renjith Kamath via
dipayanb)
Repository: ambari
Updated Branches:
refs/heads/trunk 57e3fea6e -> 31dfc5601
AMBARI-17316 [Zeppelin][Ambari] Service restart fails if one modifies the parameter zeppelin_log_dir. (Renjith Kamath via dipayanb)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31dfc560
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31dfc560
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31dfc560
Branch: refs/heads/trunk
Commit: 31dfc5601ea3ca071fe44ba9b517df6f13bc85a0
Parents: 57e3fea
Author: Dipayan Bhowmick <di...@gmail.com>
Authored: Tue Jun 21 02:26:52 2016 +0530
Committer: Dipayan Bhowmick <di...@gmail.com>
Committed: Tue Jun 21 02:26:52 2016 +0530
----------------------------------------------------------------------
.../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 5 +++++
.../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 8 +++++---
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/31dfc560/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index 2f5ac59..a912272 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -21,6 +21,11 @@
<name>zeppelin_pid_dir</name>
<value>/var/run/zeppelin</value>
<description>Dir containing process ID file</description>
+ <value-attributes>
+ <type>directory</type>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
<on-ambari-upgrade add="true"/>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/31dfc560/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index fd73464..22d66b0 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -41,15 +41,16 @@ class Master(Script):
owner=params.zeppelin_user,
group=params.zeppelin_group,
cd_access="a",
+ create_parents=True,
mode=0755
)
- Execute('echo spark_version:' + params.spark_version + ' detected for spark_home: '
- + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user)
-
# update the configs specified by user
self.configure(env)
+ Execute('echo spark_version:' + params.spark_version + ' detected for spark_home: '
+ + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user)
+
# run setup_snapshot.sh
Execute(format("{service_packagedir}/scripts/setup_snapshot.sh {zeppelin_dir} "
"{hive_metastore_host} {hive_metastore_port} {hive_server_port} "
@@ -102,6 +103,7 @@ class Master(Script):
owner=params.zeppelin_user,
group=params.zeppelin_group,
cd_access="a",
+ create_parents=True,
mode=0755
)