NAS-131763 / 25.04 / Improve app status reporting (#14668)

* Add crashed/created status

* Account for crashed/created status in workload details

* Refactor app state logic

* If we have containers in starting phase, app is still deploying

src/middlewared/middlewared/plugins/apps/ix_apps/query.py

@@ -1,4 +1,5 @@
 import os
+from collections import defaultdict
 from dataclasses import dataclass
 from pkg_resources import parse_version
 
@@ -85,19 +86,22 @@ def list_apps(
         workloads = translate_resources_to_desired_workflow(app_resources)
         # When we stop docker service and start it again - the containers can be in exited
         # state which means we need to account for this.
-        state = 'STOPPED'
-        exited_containers = 0
+        state = AppState.STOPPED
+        workload_stats = defaultdict(int)
+        workloads_len = len(workloads['container_details'])
         for container in workloads['container_details']:
-            if container['state'] == ContainerState.STARTING.value:
-                state = AppState.DEPLOYING.value
-                break
-            elif container['state'] == ContainerState.RUNNING.value:
-                state = AppState.RUNNING.value
-            elif container['state'] == ContainerState.EXITED.value:
-                exited_containers += 1
-        else:
-            if exited_containers != 0 and exited_containers == len(workloads['container_details']):
-                state = AppState.CRASHED.value
+            workload_stats[container['state']] += 1
+
+        if workload_stats[ContainerState.CRASHED.value]:
+            state = AppState.CRASHED
+        elif workload_stats[ContainerState.CREATED.value] or workload_stats[ContainerState.STARTING.value]:
+            state = AppState.DEPLOYING
+        elif 0 < workloads_len == sum(
+            workload_stats[k.value] for k in (ContainerState.RUNNING, ContainerState.EXITED)
+        ) and workload_stats[ContainerState.RUNNING.value]:
+            state = AppState.RUNNING
+
+        state = state.value
 
         app_metadata = metadata[app_name]
         active_workloads = get_default_workload_values() if state == 'STOPPED' else workloads
@@ -199,6 +203,10 @@ def translate_resources_to_desired_workflow(app_resources: dict) -> dict:
                     state = ContainerState.STARTING.value
             else:
                 state = ContainerState.RUNNING.value
+        elif container['State']['Status'].lower() == 'created':
+            state = ContainerState.CREATED.value
+        elif container['State']['Status'] == 'exited' and container['State']['ExitCode'] != 0:
+            state = ContainerState.CRASHED.value
         else:
             state = 'exited'
 

src/middlewared/middlewared/plugins/apps/ix_apps/utils.py

@@ -15,6 +15,8 @@ class AppState(enum.Enum):
 
 
 class ContainerState(enum.Enum):
+    CRASHED = 'crashed'
+    CREATED = 'created'
     EXITED = 'exited'
     RUNNING = 'running'
     STARTING = 'starting'