Repository: ambari Updated Branches: refs/heads/trunk bbe591825 -> e5bb3afba
AMBARI-20538: zeppelin spark/spark2 failing due to failure to initialize spark context (Prabhjyot Singh via r-kamath) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5bb3afb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5bb3afb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5bb3afb Branch: refs/heads/trunk Commit: e5bb3afbac724dcbdb4306a4cc256b8baf473985 Parents: bbe5918 Author: Renjith Kamath <[email protected]> Authored: Fri Mar 24 09:48:35 2017 +0530 Committer: Renjith Kamath <[email protected]> Committed: Fri Mar 24 09:48:35 2017 +0530 ---------------------------------------------------------------------- .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e5bb3afb/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 38bfeb4..575f7bc 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 @@ -162,14 +162,6 @@ class Master(Script): owner=params.zeppelin_user, group=params.zeppelin_group) self.create_zeppelin_hdfs_conf_dir(env) - # copy hive-site.xml only if Spark 1.x is installed - if 'spark-defaults' in params.config['configurations'] and params.is_hive_installed: - XmlConfig("hive-site.xml", - conf_dir=params.external_dependency_conf, - configurations=params.spark_hive_properties, - owner=params.zeppelin_user, - group=params.zeppelin_group, - mode=0644) if len(params.hbase_master_hosts) > 0 and params.is_hbase_installed: # copy hbase-site.xml
