Przeglądaj źródła

HUE-8758 [connectors] Use the selected compute when selected in the editor

Romain 6 lat temu
rodzic
commit
b020f81242

+ 1 - 1
apps/beeswax/src/beeswax/server/dbms.py

@@ -92,7 +92,7 @@ def get(user, query_server=None, cluster=None):
 
 
 
 
 def get_query_server_config(name='beeswax', connector=None):
 def get_query_server_config(name='beeswax', connector=None):
-  LOG.debug("Query cluster %s: %s" % (name, connector))
+  LOG.debug("Query cluster %s: %s" % ('' if connector else name, connector))
 
 
   if connector:
   if connector:
     query_server = {
     query_server = {

+ 6 - 5
desktop/core/src/desktop/api2.py

@@ -152,7 +152,8 @@ def get_context_computes(request, interface):
       'name': cluster['name'],
       'name': cluster['name'],
       'namespace': cluster['id'],
       'namespace': cluster['id'],
       'interface': interface,
       'interface': interface,
-      'type': cluster['type']
+      'type': cluster['type'],
+      'options': {}
     } for cluster in clusters if cluster.get('type') == 'direct'
     } for cluster in clusters if cluster.get('type') == 'direct'
   ])
   ])
 
 
@@ -161,16 +162,16 @@ def get_context_computes(request, interface):
     if interpreter['dialect'] == 'impala':
     if interpreter['dialect'] == 'impala':
       # dw_clusters = DataWarehouse2Api(request.user).list_clusters()['clusters']
       # dw_clusters = DataWarehouse2Api(request.user).list_clusters()['clusters']
       dw_clusters = [
       dw_clusters = [
-        {'crn': 'c1', 'clusterName': 'c1', 'status': 'created', 'endpoint': 'c1.gethue.com:10000'},
-        {'crn': 'c2', 'clusterName': 'c2', 'status': 'created', 'endpoint': 'c2.gethue.com:10000'},
+        {'crn': 'c1', 'clusterName': 'c1', 'status': 'created', 'options': {'server_host': 'c1.gethue.com', 'server_port': 10000}},
+        {'crn': 'c2', 'clusterName': 'c2', 'status': 'created', 'options': {'server_host': 'c2.gethue.com', 'server_port': 10000}},
       ]
       ]
       computes.extend([{
       computes.extend([{
           'id': cluster.get('crn'),
           'id': cluster.get('crn'),
           'name': cluster.get('clusterName'),
           'name': cluster.get('clusterName'),
           'status': cluster.get('status'),
           'status': cluster.get('status'),
           'namespace': cluster.get('namespaceCrn', cluster.get('crn')),
           'namespace': cluster.get('namespaceCrn', cluster.get('crn')),
-          'compute_end_point': IS_K8S_ONLY.get() and '%(publicHost)s' % cluster['coordinatorEndpoint'] or '',
-          'type': 'altus-dw'
+          'type': interpreter['dialect'],
+          'options': cluster['options'],
         } for cluster in dw_clusters]
         } for cluster in dw_clusters]
       )
       )
 
 

+ 2 - 3
desktop/libs/notebook/src/notebook/connectors/base.py

@@ -332,12 +332,11 @@ def get_api(request, snippet):
   else:
   else:
     compute = None
     compute = None
 
 
-  LOG.debug('Selected interpreter %s interface=%s compute=%s' % (interpreter, interface, compute))
-  # snippet['interface'] = interface
+  LOG.debug('Selected interpreter %s interface=%s compute=%s' % (interpreter['type'], interface, compute and compute['name']))
 
 
   if interface == 'hiveserver2':
   if interface == 'hiveserver2':
     from notebook.connectors.hiveserver2 import HS2Api
     from notebook.connectors.hiveserver2 import HS2Api
-    return HS2Api(user=request.user, request=request, interpreter=interpreter)
+    return HS2Api(user=request.user, request=request, interpreter=compute if compute else interpreter)
   elif interface == 'oozie':
   elif interface == 'oozie':
     return OozieApi(user=request.user, request=request)
     return OozieApi(user=request.user, request=request)
   elif interface == 'livy':
   elif interface == 'livy':