|
@@ -38,7 +38,7 @@ from beeswax import hive_site
|
|
|
from beeswax.conf import HIVE_SERVER_HOST, HIVE_SERVER_PORT, HIVE_METASTORE_HOST, HIVE_METASTORE_PORT, LIST_PARTITIONS_LIMIT, SERVER_CONN_TIMEOUT, \
|
|
from beeswax.conf import HIVE_SERVER_HOST, HIVE_SERVER_PORT, HIVE_METASTORE_HOST, HIVE_METASTORE_PORT, LIST_PARTITIONS_LIMIT, SERVER_CONN_TIMEOUT, \
|
|
|
AUTH_USERNAME, AUTH_PASSWORD, APPLY_NATURAL_SORT_MAX, QUERY_PARTITIONS_LIMIT, HIVE_DISCOVERY_HIVESERVER2_ZNODE, \
|
|
AUTH_USERNAME, AUTH_PASSWORD, APPLY_NATURAL_SORT_MAX, QUERY_PARTITIONS_LIMIT, HIVE_DISCOVERY_HIVESERVER2_ZNODE, \
|
|
|
HIVE_DISCOVERY_HS2, HIVE_DISCOVERY_LLAP, HIVE_DISCOVERY_LLAP_HA, HIVE_DISCOVERY_LLAP_ZNODE, CACHE_TIMEOUT, \
|
|
HIVE_DISCOVERY_HS2, HIVE_DISCOVERY_LLAP, HIVE_DISCOVERY_LLAP_HA, HIVE_DISCOVERY_LLAP_ZNODE, CACHE_TIMEOUT, \
|
|
|
- LLAP_SERVER_HOST, LLAP_SERVER_PORT
|
|
|
|
|
|
|
+ LLAP_SERVER_HOST, LLAP_SERVER_PORT, LLAP_SERVER_THRIFT_PORT
|
|
|
from beeswax.common import apply_natural_sort
|
|
from beeswax.common import apply_natural_sort
|
|
|
from beeswax.design import hql_query
|
|
from beeswax.design import hql_query
|
|
|
from beeswax.hive_site import hiveserver2_use_ssl
|
|
from beeswax.hive_site import hiveserver2_use_ssl
|
|
@@ -159,7 +159,7 @@ def get_query_server_config(name='beeswax', server=None, cluster=None):
|
|
|
query_server = {
|
|
query_server = {
|
|
|
'server_name': 'beeswax',
|
|
'server_name': 'beeswax',
|
|
|
'server_host': activeEndpoint["host"],
|
|
'server_host': activeEndpoint["host"],
|
|
|
- 'server_port': activeEndpoint["port"],
|
|
|
|
|
|
|
+ 'server_port': LLAP_SERVER_PORT.get() if name == 'llap' else HIVE_SERVER_PORT.get(),
|
|
|
'principal': kerberos_principal,
|
|
'principal': kerberos_principal,
|
|
|
'http_url': '%(protocol)s://%(host)s:%(port)s/%(end_point)s' % {
|
|
'http_url': '%(protocol)s://%(host)s:%(port)s/%(end_point)s' % {
|
|
|
'protocol': 'https' if hiveserver2_use_ssl() else 'http',
|
|
'protocol': 'https' if hiveserver2_use_ssl() else 'http',
|