You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2018/03/15 19:55:20 UTC
[ambari] branch branch-2.6 updated: [AMBARI-23245] Invalid value
for zeppelin.config.fs.dir property (#672)
This is an automated email from the ASF dual-hosted git repository.
vbrodetskyi pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 50c9a8e [AMBARI-23245] Invalid value for zeppelin.config.fs.dir property (#672)
50c9a8e is described below
commit 50c9a8ee4993385e67cf25437273a0f6964d3ce3
Author: vbrodetskyi <vb...@cybervisiontech.com>
AuthorDate: Thu Mar 15 21:55:18 2018 +0200
[AMBARI-23245] Invalid value for zeppelin.config.fs.dir property (#672)
---
.../ZEPPELIN/0.7.0/configuration/zeppelin-config.xml | 6 ------
.../main/resources/stacks/HDP/2.6/services/stack_advisor.py | 11 ++++++++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml
index 0fbb380..0deb7ea 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml
@@ -86,12 +86,6 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
- <name>zeppelin.config.fs.dir</name>
- <value>conf</value>
- <description>Location where interpreter.json should be installed</description>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
<name>zeppelin.interpreter.dir</name>
<value>interpreter</value>
<description>Interpreter implementation base directory</description>
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 27558cb..08f1947 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -122,11 +122,16 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
cluster_env = self.getServicesSiteProperties(services, "cluster-env")
if cluster_env and "recommendations_full_stack_version" in cluster_env:
full_stack_version = cluster_env["recommendations_full_stack_version"]
- if compare_versions(full_stack_version, '2.6.3.0') >= 0:
+ if full_stack_version and compare_versions(full_stack_version, '2.6.3.0', format=True) >= 0:
zeppelin_config = self.getServicesSiteProperties(services, "zeppelin-config")
- if zeppelin_config and zeppelin_config.get('zeppelin.notebook.storage', None) == 'org.apache.zeppelin.notebook.repo.VFSNotebookRepo':
+ if zeppelin_config:
putZeppelinConfigProperty = self.putProperty(configurations, 'zeppelin-config', services)
- putZeppelinConfigProperty('zeppelin.notebook.storage', 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo')
+
+ if zeppelin_config.get('zeppelin.notebook.storage', None) == 'org.apache.zeppelin.notebook.repo.VFSNotebookRepo':
+ putZeppelinConfigProperty('zeppelin.notebook.storage', 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo')
+
+ if 'zeppelin.config.fs.dir' not in zeppelin_config:
+ putZeppelinConfigProperty('zeppelin.config.fs.dir', 'conf')
self.__addZeppelinToLivy2SuperUsers(configurations, services)
--
To stop receiving notification emails like this one, please contact
vbrodetskyi@apache.org.