Преглед изворни кода

HUE-8591 [cluster] Properly use the correct cluster hostname in the editor

Romain Rigaux пре 7 година
родитељ
комит
85d23d4

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

@@ -77,6 +77,7 @@ def get(user, query_server=None, cluster=None):
 
 
 def get_query_server_config(name='beeswax', server=None, cluster=None):
+  LOG.debug("Query cluster: %s" % cluster)
   if cluster and cluster != CLUSTER_ID.get():
     if cluster and 'altus:dataware:k8s' in cluster:
       name = re.search('cluster:(.+?)/', cluster).group(1)

+ 2 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -1143,7 +1143,8 @@ ${ commonheader("Data Warehouse", "jobbrowser", user, request) | n,unicode }
             </div>
           </li>
           <li class="nav-header">${ _('Impalad') }</li>
-          <li><span data-bind="text: properties['properties']['coordinatorEndpoint']['publicHost']"></span></li>
+          <li>
+            <span data-bind="text: properties['properties']['coordinatorEndpoint']['publicHost']"></span></li>
         </ul>
       </div>
     </div>

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/base.py

@@ -328,7 +328,7 @@ def get_api(request, snippet):
     interface = 'dataeng'
 
   if cluster:
-    LOG.info('Selected cluster %s' % cluster)
+    LOG.info('Selected cluster %s interface %s' % (cluster, interface))
 
   if interface == 'hiveserver2':
     from notebook.connectors.hiveserver2 import HS2Api

+ 2 - 2
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -168,7 +168,7 @@ class HS2Api(Api):
 
     reuse_session = session is not None
     if not reuse_session:
-      session = dbms.get(self.user, query_server=get_query_server_config(name=lang)).open_session(self.user)
+      session = dbms.get(self.user, query_server=get_query_server_config(name=lang, cluster=self.cluster)).open_session(self.user)
 
     response = {
       'type': lang,
@@ -238,7 +238,7 @@ class HS2Api(Api):
 
   @query_error_handler
   def execute(self, notebook, snippet):
-    db = self._get_db(snippet, cluster=snippet.get('selectedCompute'))
+    db = self._get_db(snippet, cluster=self.cluster)
 
     statement = self._get_current_statement(db, snippet)
     session = self._get_session(notebook, snippet['type'])