Prechádzať zdrojové kódy

HUE-8670 [cluster] Switch Terminating cluster to Stopped when properly shutdown

Romain Rigaux 7 rokov pred
rodič
commit
7b66215

+ 2 - 2
apps/jobbrowser/src/jobbrowser/apis/clusters.py

@@ -123,9 +123,9 @@ class ClusterApi(Api):
     return {}
 
   def _api_status(self, status):
-    if status in ['CREATING', 'CREATED', 'ONLINE', 'SCALING_UP', 'SCALING_DOWN', 'STOPPED', 'STARTING']: # ONLINE ... are from K8s
+    if status in ['CREATING', 'CREATED', 'ONLINE', 'SCALING_UP', 'SCALING_DOWN', 'STARTING']: # ONLINE ... are from K8s
       return 'RUNNING'
-    elif status in ['ARCHIVING', 'COMPLETED', 'TERMINATING']:
+    elif status in ['ARCHIVING', 'COMPLETED', 'TERMINATING', 'STOPPED']:
       return 'SUCCEEDED'
     else:
       return 'FAILED' # KILLED and FAILED

+ 2 - 2
apps/jobbrowser/src/jobbrowser/apis/data_warehouse.py

@@ -111,9 +111,9 @@ class DataWarehouseClusterApi(Api):
     return {}
 
   def _api_status(self, status):
-    if status in ['CREATING', 'CREATED', 'ONLINE', 'SCALING_UP', 'SCALING_DOWN', 'STOPPED', 'STARTING']: # ONLINE ... are from K8s
+    if status in ['CREATING', 'CREATED', 'ONLINE', 'SCALING_UP', 'SCALING_DOWN', 'STARTING']: # ONLINE ... are from K8s
       return 'RUNNING'
-    elif status in ['ARCHIVING', 'COMPLETED', 'TERMINATING']:
+    elif status in ['ARCHIVING', 'COMPLETED', 'TERMINATING', 'TERMINATED', 'STOPPED']:
       return 'SUCCEEDED'
     else:
       return 'FAILED' # KILLED and FAILED

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

@@ -1272,8 +1272,8 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           </li>
           <li class="nav-header">${ _('Auto resize') }</li>
           <li>
-            <i data-bind="visible: !updateClusterAutoResize()" class="fa fa-square-o fa-fw"></i>
-            <i data-bind="visible: updateClusterAutoResize()" class="fa fa-check-square-o fa-fw"></i>
+            <i data-bind="visible: !properties['properties']['workerAutoResize']()" class="fa fa-square-o fa-fw"></i>
+            <i data-bind="visible: properties['properties']['workerAutoResize']" class="fa fa-check-square-o fa-fw"></i>
           </li>
           <li class="nav-header">${ _('Auto pause') }</li>
           <li><i class="fa fa-square-o fa-fw"></i></li>
@@ -2700,6 +2700,10 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
       self.updateClusterShow.subscribe(function(newVal) {
         if (newVal) {
           self.updateClusterWorkers(self.properties['properties']['workerReplicas']());
+          self.updateClusterAutoResize(self.properties['properties']['workerAutoResize']());
+          self.updateClusterAutoResizeMin(self.properties['properties']['workerAutoResizeMin']());
+          self.updateClusterAutoResizeMax(self.properties['properties']['workerAutoResizeMax']());
+          self.updateClusterAutoResizeCpu(self.properties['properties']['workerAutoResizeCpu']());
         }
       });