AMBARI-22229.Handle upload of interpreter.json to remote storage in Ambari(Prabhjyot Singh via Venkata Sairam)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8ba5e61 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8ba5e61 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8ba5e61 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: a8ba5e61c50ac92b787d3b2de4cec8d29da92d74 Parents: 0f76c7f Author: Venkata Sairam <venkatasairam.la...@gmail.com> Authored: Fri Oct 13 15:22:33 2017 +0530 Committer: Venkata Sairam <venkatasairam.la...@gmail.com> Committed: Fri Oct 13 15:22:33 2017 +0530 ---------------------------------------------------------------------- .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 3 ++- .../src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/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 a8b1b32..6a84d79 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 @@ -305,7 +305,8 @@ class Master(Script): def get_zeppelin_conf_FS_directory(self, params): hdfs_interpreter_config = params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir'] - if not hdfs_interpreter_config.startswith("/"): + # if it doesn't start from "/" or doesn't contains "://" as in hdfs://, file://, etc then make it a absolute path + if not (hdfs_interpreter_config.startswith("/") or '://' in hdfs_interpreter_config): hdfs_interpreter_config = "/user/" + format("{zeppelin_user}") + "/" + hdfs_interpreter_config return hdfs_interpreter_config http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/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 e5d0240..400350c 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 @@ -342,7 +342,7 @@ class TestZeppelin070(RMFTestCase): ) self.assertResourceCalled('HdfsResource', - '/user/zeppelin/hdfs:///user/zeppelin/conf', + 'hdfs:///user/zeppelin/conf', security_enabled=False, hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin', keytab=UnknownConfigurationMock(), @@ -368,7 +368,7 @@ class TestZeppelin070(RMFTestCase): self.assertResourceCalled('HdfsResource', - '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json', + 'hdfs:///user/zeppelin/conf/interpreter.json', security_enabled=False, hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin', keytab=UnknownConfigurationMock(), @@ -395,7 +395,7 @@ class TestZeppelin070(RMFTestCase): ) self.assertResourceCalled('HdfsResource', - '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json', + 'hdfs:///user/zeppelin/conf/interpreter.json', security_enabled=False, hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin', keytab=UnknownConfigurationMock(), @@ -421,7 +421,7 @@ class TestZeppelin070(RMFTestCase): group='zeppelin', ) - self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json', + self.assertResourceCalled('HdfsResource', 'hdfs:///user/zeppelin/conf/interpreter.json', security_enabled = False, hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin', keytab = UnknownConfigurationMock(),