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 2017/09/28 16:08:09 UTC

[2/2] 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/4d3d0462
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d3d0462
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d3d0462

Branch: refs/heads/branch-2.6
Commit: 4d3d0462a93eb7c6c9edf52247d55843b7f1cae5
Parents: 22e7697
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Sep 28 19:07:49 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Sep 28 19:07:49 2017 +0300

----------------------------------------------------------------------
 .../ZEPPELIN/0.7.0/package/scripts/master.py         | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d3d0462/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):