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:35 UTC
[24/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/fb4115e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb4115e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb4115e2
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: fb4115e27eda3591d944bd7adb6c0fb449538a2a
Parents: 63733bf
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Sep 28 19:50:57 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Sep 28 19:50:57 2017 +0300
----------------------------------------------------------------------
.pydevproject | 5 -
ambari-agent/.pydevproject | 14 --
ambari-server/.pydevproject | 5 -
.../stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 216 +++++++++----------
4 files changed, 105 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb4115e2/.pydevproject
----------------------------------------------------------------------
diff --git a/.pydevproject b/.pydevproject
deleted file mode 100644
index 40e9f40..0000000
--- a/.pydevproject
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/fb4115e2/ambari-agent/.pydevproject
----------------------------------------------------------------------
diff --git a/ambari-agent/.pydevproject b/ambari-agent/.pydevproject
deleted file mode 100644
index c62d80f..0000000
--- a/ambari-agent/.pydevproject
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/fb4115e2/ambari-server/.pydevproject
----------------------------------------------------------------------
diff --git a/ambari-server/.pydevproject b/ambari-server/.pydevproject
deleted file mode 100644
index 7ff1370..0000000
--- a/ambari-server/.pydevproject
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/fb4115e2/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index 5ae3739..e0e4259 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -305,24 +305,23 @@ class TestZeppelin070(RMFTestCase):
security_enabled=False,
)
- self.assertResourceCalled('HdfsResource',
- '/etc/zeppelin/conf/interpreter.json',
- hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
- default_fs=u'hdfs://c6401.ambari.apache.org:8020',
- hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
- hdfs_site={u'a': u'b'},
- kinit_path_local='/usr/bin/kinit',
- user="zeppelin",
- owner="zeppelin",
- group="zeppelin",
- type='file',
- action=['download_on_execute'],
- source="/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json",
- hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
- keytab=UnknownConfigurationMock(),
- principal_name=UnknownConfigurationMock(),
- security_enabled=False,
- )
+ self.assertResourceCalled('HdfsResource', '/etc/zeppelin/conf/interpreter.json',
+ security_enabled = False,
+ hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+ keytab = UnknownConfigurationMock(),
+ source = '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+ default_fs = 'hdfs://c6401.ambari.apache.org:8020',
+ hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+ hdfs_site = {u'a': u'b'},
+ kinit_path_local = '/usr/bin/kinit',
+ principal_name = UnknownConfigurationMock(),
+ user = 'hdfs',
+ owner = 'zeppelin',
+ group = 'zeppelin',
+ hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ type = 'file',
+ action = ['download_on_execute'],
+ )
self.assertResourceCalled('File', '/etc/zeppelin/conf/interpreter.json',
content=interpreter_json_generated.template_after_base,
@@ -330,44 +329,42 @@ class TestZeppelin070(RMFTestCase):
group='zeppelin',
)
- self.assertResourceCalled('HdfsResource',
- '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
- hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
- default_fs=u'hdfs://c6401.ambari.apache.org:8020',
- hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
- hdfs_site={u'a': u'b'},
- kinit_path_local='/usr/bin/kinit',
- user="zeppelin",
- owner="zeppelin",
- group="zeppelin",
- type='file',
- action=['create_on_execute'],
- source="/etc/zeppelin/conf/interpreter.json",
- replace_existing_files=True,
- hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
- keytab=UnknownConfigurationMock(),
- principal_name=UnknownConfigurationMock(),
- security_enabled=False,
- )
+ self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+ security_enabled = False,
+ hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+ keytab = UnknownConfigurationMock(),
+ source = '/etc/zeppelin/conf/interpreter.json',
+ default_fs = 'hdfs://c6401.ambari.apache.org:8020',
+ replace_existing_files = True,
+ hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+ hdfs_site = {u'a': u'b'},
+ kinit_path_local = '/usr/bin/kinit',
+ principal_name = UnknownConfigurationMock(),
+ user = 'hdfs',
+ owner = 'zeppelin',
+ group = 'zeppelin',
+ hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ type = 'file',
+ action = ['create_on_execute'],
+ )
- self.assertResourceCalled('HdfsResource',
- '/etc/zeppelin/conf/interpreter.json',
- hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
- default_fs=u'hdfs://c6401.ambari.apache.org:8020',
- hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
- hdfs_site={u'a': u'b'},
- kinit_path_local='/usr/bin/kinit',
- user="zeppelin",
- owner="zeppelin",
- group="zeppelin",
- type='file',
- action=['download_on_execute'],
- source="/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json",
- hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
- keytab=UnknownConfigurationMock(),
- principal_name=UnknownConfigurationMock(),
- security_enabled=False,
- )
+ self.assertResourceCalled('HdfsResource', '/etc/zeppelin/conf/interpreter.json',
+ security_enabled = False,
+ hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+ keytab = UnknownConfigurationMock(),
+ source = '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+ default_fs = 'hdfs://c6401.ambari.apache.org:8020',
+ hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+ hdfs_site = {u'a': u'b'},
+ kinit_path_local = '/usr/bin/kinit',
+ principal_name = UnknownConfigurationMock(),
+ user = 'hdfs',
+ owner = 'zeppelin',
+ group = 'zeppelin',
+ hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ type = 'file',
+ action = ['download_on_execute'],
+ )
self.assertResourceCalled('File', '/etc/zeppelin/conf/interpreter.json',
content=interpreter_json_generated.template_after_without_spark_and_livy,
@@ -375,44 +372,42 @@ class TestZeppelin070(RMFTestCase):
group='zeppelin',
)
- self.assertResourceCalled('HdfsResource',
- '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
- hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
- default_fs=u'hdfs://c6401.ambari.apache.org:8020',
- hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
- hdfs_site={u'a': u'b'},
- kinit_path_local='/usr/bin/kinit',
- user="zeppelin",
- owner="zeppelin",
- group="zeppelin",
- type='file',
- action=['create_on_execute'],
- source="/etc/zeppelin/conf/interpreter.json",
- replace_existing_files=True,
- hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
- keytab=UnknownConfigurationMock(),
- principal_name=UnknownConfigurationMock(),
- security_enabled=False,
- )
+ self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+ security_enabled = False,
+ hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+ keytab = UnknownConfigurationMock(),
+ source = '/etc/zeppelin/conf/interpreter.json',
+ default_fs = 'hdfs://c6401.ambari.apache.org:8020',
+ replace_existing_files = True,
+ hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+ hdfs_site = {u'a': u'b'},
+ kinit_path_local = '/usr/bin/kinit',
+ principal_name = UnknownConfigurationMock(),
+ user = 'hdfs',
+ owner = 'zeppelin',
+ group = 'zeppelin',
+ hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ type = 'file',
+ action = ['create_on_execute'],
+ )
- self.assertResourceCalled('HdfsResource',
- '/etc/zeppelin/conf/interpreter.json',
- hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
- default_fs=u'hdfs://c6401.ambari.apache.org:8020',
- hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
- hdfs_site={u'a': u'b'},
- kinit_path_local='/usr/bin/kinit',
- user="zeppelin",
- owner="zeppelin",
- group="zeppelin",
- type='file',
- action=['download_on_execute'],
- source="/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json",
- hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
- keytab=UnknownConfigurationMock(),
- principal_name=UnknownConfigurationMock(),
- security_enabled=False,
- )
+ self.assertResourceCalled('HdfsResource', '/etc/zeppelin/conf/interpreter.json',
+ security_enabled = False,
+ hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+ keytab = UnknownConfigurationMock(),
+ source = '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+ default_fs = 'hdfs://c6401.ambari.apache.org:8020',
+ hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+ hdfs_site = {u'a': u'b'},
+ kinit_path_local = '/usr/bin/kinit',
+ principal_name = UnknownConfigurationMock(),
+ user = 'hdfs',
+ owner = 'zeppelin',
+ group = 'zeppelin',
+ hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ type = 'file',
+ action = ['download_on_execute'],
+ )
self.assertResourceCalled('File', '/etc/zeppelin/conf/interpreter.json',
content=interpreter_json_generated.template_after_kerberos,
@@ -420,25 +415,24 @@ class TestZeppelin070(RMFTestCase):
group='zeppelin',
)
- self.assertResourceCalled('HdfsResource',
- '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
- hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
- default_fs=u'hdfs://c6401.ambari.apache.org:8020',
- hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
- hdfs_site={u'a': u'b'},
- kinit_path_local='/usr/bin/kinit',
- user="zeppelin",
- owner="zeppelin",
- group="zeppelin",
- type='file',
- action=['create_on_execute'],
- source="/etc/zeppelin/conf/interpreter.json",
- replace_existing_files=True,
- hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
- keytab=UnknownConfigurationMock(),
- principal_name=UnknownConfigurationMock(),
- security_enabled=False,
- )
+ self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+ security_enabled = False,
+ hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+ keytab = UnknownConfigurationMock(),
+ source = '/etc/zeppelin/conf/interpreter.json',
+ default_fs = 'hdfs://c6401.ambari.apache.org:8020',
+ replace_existing_files = True,
+ hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+ hdfs_site = {u'a': u'b'},
+ kinit_path_local = '/usr/bin/kinit',
+ principal_name = UnknownConfigurationMock(),
+ user = 'hdfs',
+ owner = 'zeppelin',
+ group = 'zeppelin',
+ hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ type = 'file',
+ action = ['create_on_execute'],
+ )
self.assertResourceCalled('Execute',
'/usr/hdp/current/zeppelin-server/bin/zeppelin-daemon.sh restart >> /var/log/zeppelin/zeppelin-setup.log',