You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/02 20:39:34 UTC
[23/50] [abbrv] ambari git commit: AMBARI-22085. Zeppelin start
failed (aonishuk)
AMBARI-22085. Zeppelin start failed (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63733bf2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63733bf2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63733bf2
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 63733bf29d19cef8a8e8f54fcfb151e4be04bdf5
Parents: b660bf1
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Sep 28 19:07:46 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Sep 28 19:07:46 2017 +0300
----------------------------------------------------------------------
.pydevproject | 5 +++++
ambari-agent/.pydevproject | 14 ++++++++++++++
ambari-server/.pydevproject | 5 +++++
.../ZEPPELIN/0.7.0/package/scripts/master.py | 15 +++++----------
4 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/63733bf2/.pydevproject
----------------------------------------------------------------------
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 0000000..40e9f40
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/63733bf2/ambari-agent/.pydevproject
----------------------------------------------------------------------
diff --git a/ambari-agent/.pydevproject b/ambari-agent/.pydevproject
new file mode 100644
index 0000000..c62d80f
--- /dev/null
+++ b/ambari-agent/.pydevproject
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
+<path>/home/user/ambari/ambari-common/src/test/python</path>
+<path>/home/user/ambari/ambari-common/src/main/python</path>
+<path>/home/user/ambari/ambari-common/src/main/python/ambari_jinja2</path>
+</pydev_pathproperty>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/${PROJECT_DIR_NAME}/src/main/python</path>
+<path>/${PROJECT_DIR_NAME}/src/main/python/ambari_agent</path>
+</pydev_pathproperty>
+</pydev_project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/63733bf2/ambari-server/.pydevproject
----------------------------------------------------------------------
diff --git a/ambari-server/.pydevproject b/ambari-server/.pydevproject
new file mode 100644
index 0000000..7ff1370
--- /dev/null
+++ b/ambari-server/.pydevproject
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/63733bf2/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index af5758a..a450fb6 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -23,7 +23,6 @@ import os
from resource_management.core import shell, sudo
from resource_management.core.logger import Logger
-from resource_management.core.exceptions import Fail
from resource_management.core.resources import Directory
from resource_management.core.resources.system import Execute, File
from resource_management.core.source import InlineTemplate
@@ -320,20 +319,17 @@ class Master(Script):
and params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] == 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo':
if 'zeppelin.config.fs.dir' in params.config['configurations']['zeppelin-config']:
- try:
+ zeppelin_conf_fs = self.getZeppelinConfFS(params)
+ if os.path.exists(zeppelin_conf_fs):
# copy from hdfs to /etc/zeppelin/conf/interpreter.json
params.HdfsResource(interpreter_config,
type="file",
action="download_on_execute",
- source=self.getZeppelinConfFS(params),
- user=params.zeppelin_user,
+ source=zeppelin_conf_fs,
group=params.zeppelin_group,
owner=params.zeppelin_user)
- except Fail as fail:
- if "doesn't exist" not in fail.args[0]:
- print "Error getting interpreter.json from HDFS"
- print fail.args
- raise Fail
+ else:
+ Logger.info(format("{zeppelin_conf_fs} does not exist. Skipping upload of DFS."))
config_content = sudo.read_file(interpreter_config)
config_data = json.loads(config_content)
@@ -359,7 +355,6 @@ class Master(Script):
source=interpreter_config,
group=params.zeppelin_group,
owner=params.zeppelin_user,
- user=params.zeppelin_user,
replace_existing_files=True)
def update_kerberos_properties(self):