You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/12/27 13:55:18 UTC
[1/2] ambari git commit: AMBARI-19300. Zeppelin fails to start if
spark is installed (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 f0877b19d -> ca7d93598
refs/heads/trunk eca4e54ee -> 7d3d71b97
AMBARI-19300. Zeppelin fails to start if spark is installed (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d3d71b9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d3d71b9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d3d71b9
Branch: refs/heads/trunk
Commit: 7d3d71b977348afe745ed4b230c553cf8614cb0c
Parents: eca4e54
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Dec 27 15:54:59 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Dec 27 15:54:59 2016 +0200
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d3d71b9/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 0bcc282..04089ce 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,6 +46,8 @@ class Master(Script):
env.set_params(params)
self.install_packages(env)
+ self.create_zeppelin_log_dir(env)
+
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)
[2/2] ambari git commit: AMBARI-19300. Zeppelin fails to start if
spark is installed (aonishuk)
Posted by ao...@apache.org.
AMBARI-19300. Zeppelin fails to start if spark is installed (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ca7d9359
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca7d9359
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca7d9359
Branch: refs/heads/branch-2.5
Commit: ca7d93598fe4b13a445f89b6f7a9182abfd7522b
Parents: f0877b1
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Dec 27 15:55:02 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Dec 27 15:55:02 2016 +0200
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ca7d9359/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 0bcc282..04089ce 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,6 +46,8 @@ class Master(Script):
env.set_params(params)
self.install_packages(env)
+ self.create_zeppelin_log_dir(env)
+
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)