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:26 UTC
[15/50] [abbrv] ambari git commit: AMBARI-22069.Zeppelin JDBC queries
should be split by default(Prabhjyot Singh via Venkata Sairam)
AMBARI-22069.Zeppelin JDBC queries should be split by default(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/f4e4fae8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4e4fae8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4e4fae8
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: f4e4fae8ef085a7e646ea0c5f986b00f10cfdfdc
Parents: 407eb54
Author: Venkata Sairam <ve...@gmail.com>
Authored: Wed Sep 27 19:46:56 2017 +0530
Committer: Venkata Sairam <ve...@gmail.com>
Committed: Wed Sep 27 19:46:56 2017 +0530
----------------------------------------------------------------------
.../ZEPPELIN/0.7.0/package/scripts/master.py | 13 +++++++++++++
.../python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4e4fae8/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 8bdfaec..af5758a 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
@@ -326,6 +326,7 @@ class Master(Script):
type="file",
action="download_on_execute",
source=self.getZeppelinConfFS(params),
+ user=params.zeppelin_user,
group=params.zeppelin_group,
owner=params.zeppelin_user)
except Fail as fail:
@@ -456,6 +457,9 @@ class Master(Script):
interpreter['properties']['hive.url'] = 'jdbc:hive2://' + \
params.hive_server_host + \
':' + params.hive_server_port
+ if 'hive.splitQueries' not in interpreter['properties']:
+ interpreter['properties']["hive.splitQueries"] = "true"
+
if params.hive_server_interactive_hosts:
interpreter['properties'][hive_interactive_properties_key + '.driver'] = 'org.apache.hive.jdbc.HiveDriver'
interpreter['properties'][hive_interactive_properties_key + '.user'] = 'hive'
@@ -470,6 +474,8 @@ class Master(Script):
interpreter['properties'][hive_interactive_properties_key + '.url'] = 'jdbc:hive2://' + \
params.hive_server_interactive_hosts + \
':' + params.hive_server_port
+ if hive_interactive_properties_key + '.splitQueries' not in interpreter['properties']:
+ interpreter['properties'][hive_interactive_properties_key + '.splitQueries'] = "true"
if params.spark_thrift_server_hosts:
interpreter['properties']['spark.driver'] = 'org.apache.hive.jdbc.HiveDriver'
@@ -480,6 +486,8 @@ class Master(Script):
params.spark_thrift_server_hosts + ':' + params.spark_hive_thrift_port + '/'
if params.spark_hive_principal:
interpreter['properties']['spark.url'] += ';principal=' + params.spark_hive_principal
+ if 'spark.splitQueries' not in interpreter['properties']:
+ interpreter['properties']['spark.splitQueries'] = "true"
if params.spark2_thrift_server_hosts:
interpreter['properties']['spark2.driver'] = 'org.apache.hive.jdbc.HiveDriver'
@@ -490,6 +498,8 @@ class Master(Script):
params.spark2_thrift_server_hosts + ':' + params.spark2_hive_thrift_port + '/'
if params.spark_hive_principal:
interpreter['properties']['spark2.url'] += ';principal=' + params.spark2_hive_principal
+ if 'spark2.splitQueries' not in interpreter['properties']:
+ interpreter['properties']['spark2.splitQueries'] = "true"
if params.zookeeper_znode_parent \
and params.hbase_zookeeper_quorum:
@@ -500,6 +510,9 @@ class Master(Script):
interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \
params.hbase_zookeeper_quorum + ':' + \
params.zookeeper_znode_parent
+ if 'phoenix.splitQueries' not in interpreter['properties']:
+ interpreter['properties']['phoenix.splitQueries'] = "true"
+
elif interpreter['group'] == 'livy' and interpreter['name'] == 'livy':
if params.livy_livyserver_host:
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4e4fae8/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 1fdbadb..5ae3739 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
@@ -312,7 +312,7 @@ class TestZeppelin070(RMFTestCase):
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="hdfs",
+ user="zeppelin",
owner="zeppelin",
group="zeppelin",
type='file',
@@ -357,7 +357,7 @@ class TestZeppelin070(RMFTestCase):
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="hdfs",
+ user="zeppelin",
owner="zeppelin",
group="zeppelin",
type='file',
@@ -402,7 +402,7 @@ class TestZeppelin070(RMFTestCase):
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="hdfs",
+ user="zeppelin",
owner="zeppelin",
group="zeppelin",
type='file',