AMBARI-18872 Zeppelin notebook execution fails due missing spark dependency
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49d6d88d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49d6d88d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49d6d88d Branch: refs/heads/branch-feature-AMBARI-18901 Commit: 49d6d88dcf7ed8c15152cdca7bc1fbf2ba6c8d5a Parents: 7956950 Author: Renjith Kamath <[email protected]> Authored: Wed Nov 16 22:52:51 2016 +0530 Committer: Renjith Kamath <[email protected]> Committed: Wed Nov 16 22:56:03 2016 +0530 ---------------------------------------------------------------------- .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 11 +++++++---- .../src/main/resources/scripts/Ambaripreupload.py | 2 +- .../stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/49d6d88d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 080fcd6..33a2a14 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -84,7 +84,7 @@ class Master(Script): recursive_chmod=True ) - spark_deps_full_path = glob.glob(params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar')[0] + spark_deps_full_path = self.get_zeppelin_spark_dependencies()[0] spark_dep_file_name = os.path.basename(spark_deps_full_path); params.HdfsResource(params.spark_jar_dir + "/" + spark_dep_file_name, @@ -168,9 +168,8 @@ class Master(Script): zeppelin_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ") Execute(zeppelin_kinit_cmd, user=params.zeppelin_user) - if glob.glob( - params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar') and os.path.exists( - glob.glob(params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar')[0]): + zeppelin_spark_dependencies = self.get_zeppelin_spark_dependencies() + if zeppelin_spark_dependencies and os.path.exists(zeppelin_spark_dependencies[0]): self.create_zeppelin_dir(params) # if first_setup: @@ -326,5 +325,9 @@ class Master(Script): return False return False + def get_zeppelin_spark_dependencies(self): + import params + return glob.glob(params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies*.jar') + if __name__ == "__main__": Master().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/49d6d88d/ambari-server/src/main/resources/scripts/Ambaripreupload.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py b/ambari-server/src/main/resources/scripts/Ambaripreupload.py index c04424f..bedf859 100644 --- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py +++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py @@ -415,7 +415,7 @@ with Environment() as env: copy_tarballs_to_hdfs(format("/usr/hdp/{stack_version}/sqoop/sqoop.tar.gz"), hdfs_path_prefix+"/hdp/apps/{{ stack_version_formatted }}/sqoop/", 'hadoop-mapreduce-historyserver', params.mapred_user, params.hdfs_user, params.user_group) createHdfsResources() - copy_zeppelin_dependencies_to_hdfs(format("/usr/hdp/{stack_version}/zeppelin/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar")) + copy_zeppelin_dependencies_to_hdfs(format("/usr/hdp/{stack_version}/zeppelin/interpreter/spark/dep/zeppelin-spark-dependencies*.jar")) putSQLDriverToOozieShared() putCreatedHdfsResourcesToIgnore(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/49d6d88d/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml index 0c3aa77..e8ab191 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml @@ -21,7 +21,7 @@ <services> <service> <name>ZEPPELIN</name> - <version>0.6.0.2.5</version> + <version>0.7.0.2.6</version> </service> </services> </metainfo>
