ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rkam...@apache.org
Subject [1/2] ambari git commit: AMBARI-19627 Cannot start Zeppelin notebook if Hive is not installed (r-kamath)
Date Mon, 23 Jan 2017 06:25:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f06dcd7bc -> 8396f27b7
  refs/heads/trunk 2463b0a26 -> f4a3dbcbc


AMBARI-19627 Cannot start Zeppelin notebook if Hive is not installed (r-kamath)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8396f27b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8396f27b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8396f27b

Branch: refs/heads/branch-2.5
Commit: 8396f27b732a98a93c6f63ed3f471c684f6eb70e
Parents: f06dcd7
Author: Renjith Kamath <renjith.kamath@gmail.com>
Authored: Mon Jan 23 11:48:17 2017 +0530
Committer: Renjith Kamath <renjith.kamath@gmail.com>
Committed: Mon Jan 23 11:48:17 2017 +0530

----------------------------------------------------------------------
 .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8396f27b/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 b609538..9af48e5 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
@@ -151,11 +151,13 @@ class Master(Script):
          owner=params.zeppelin_user, group=params.zeppelin_group)
 
     # copy hive-site.xml only if Spark 1.x is installed
-    if 'spark-defaults' in params.config['configurations']:
+    if 'spark-defaults' in params.config['configurations'] and \
+        os.path.exists("/etc/spark/conf/hive-site.xml"):
         File(format("{params.conf_dir}/hive-site.xml"), content=StaticFile("/etc/spark/conf/hive-site.xml"),
              owner=params.zeppelin_user, group=params.zeppelin_group)
 
-    if len(params.hbase_master_hosts) > 0:
+    if len(params.hbase_master_hosts) > 0 and \
+        os.path.exists("/etc/hbase/conf/hbase-site.xml"):
       # copy hbase-site.xml
       File(format("{params.conf_dir}/hbase-site.xml"), content=StaticFile("/etc/hbase/conf/hbase-site.xml"),
            owner=params.zeppelin_user, group=params.zeppelin_group)


Mime
View raw message