You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/12/22 17:08:28 UTC
[24/26] ambari git commit: AMBARI-19284. Zeppelin Notebook start
fails after reboot (aonishuk)
AMBARI-19284. Zeppelin Notebook start fails after reboot (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a100c0b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a100c0b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a100c0b3
Branch: refs/heads/branch-dev-patch-upgrade
Commit: a100c0b3ee1f480f4721586084de8f8d0639b6c0
Parents: 98a83c5
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Dec 22 18:37:57 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Dec 22 18:37:57 2016 +0200
----------------------------------------------------------------------
.../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a100c0b3/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 39941f7..cfd6963 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
@@ -46,15 +46,6 @@ class Master(Script):
env.set_params(params)
self.install_packages(env)
- # create the pid and zeppelin dirs
- Directory([params.zeppelin_pid_dir, params.zeppelin_dir],
- owner=params.zeppelin_user,
- group=params.zeppelin_group,
- cd_access="a",
- create_parents=True,
- mode=0755
- )
-
if params.spark_version:
Execute('echo spark_version:' + str(params.spark_version) + ' detected for spark_home: '
+ params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user)
@@ -118,6 +109,15 @@ class Master(Script):
env.set_params(status_params)
self.create_zeppelin_log_dir(env)
+ # create the pid and zeppelin dirs
+ Directory([params.zeppelin_pid_dir, params.zeppelin_dir],
+ owner=params.zeppelin_user,
+ group=params.zeppelin_group,
+ cd_access="a",
+ create_parents=True,
+ mode=0755
+ )
+
# write out zeppelin-site.xml
XmlConfig("zeppelin-site.xml",
conf_dir=params.conf_dir,