Browse Source

HUE-8330 [impala] Use main ini properly when core cluster is selected

Romain Rigaux 7 years ago
parent
commit
9b4ddd7ea1
2 changed files with 2 additions and 4 deletions
  1. 2 1
      apps/beeswax/src/beeswax/server/dbms.py
  2. 0 3
      desktop/core/src/desktop/api2.py

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

@@ -38,6 +38,7 @@ from beeswax.common import apply_natural_sort
 from beeswax.design import hql_query
 from beeswax.hive_site import hiveserver2_use_ssl
 from beeswax.models import QueryHistory, QUERY_TYPES
+from desktop.conf import CLUSTER_ID
 
 
 LOG = logging.getLogger(__name__)
@@ -76,7 +77,7 @@ def get(user, query_server=None, cluster=None):
 
 
 def get_query_server_config(name='beeswax', server=None, cluster=None):
-  if cluster:
+  if cluster and cluster != CLUSTER_ID.get():
     cluster_config = Cluster(user=None).get_config(cluster)
   else:
     cluster_config = None

+ 0 - 3
desktop/core/src/desktop/api2.py

@@ -140,9 +140,6 @@ def get_context_computes(request, interface):
           'name': cluster.get('clusterName', 'Unknown'),
           'status': cluster.get('status'),
           'namespace': cluster.get('namespaceCrn'),
-          # environmentType
-          # secured
-          # cdhVersion
           'type': 'altus-adb'
         } for cluster in AnalyticDbApi(request.user).list_clusters()['clusters']]
       )