Align transient status handling

Author: mxsrc

src/api/organization/project/branch/__init__.py

@@ -200,20 +200,9 @@ async def _cleanup_failed_branch_deployment(branch_id: Identifier) -> None:
 def _should_update_branch_status(
     current: BranchServiceStatus,
     derived: BranchServiceStatus,
-    *,
-    resize_in_progress: bool = True,
 ) -> bool:
     if current == derived:
         return False
-    if current == BranchServiceStatus.RESIZING:
-        if not resize_in_progress:
-            return derived in {
-                BranchServiceStatus.ACTIVE_HEALTHY,
-                BranchServiceStatus.ACTIVE_UNHEALTHY,
-                BranchServiceStatus.STOPPED,
-                BranchServiceStatus.ERROR,
-            }
-        return derived == BranchServiceStatus.ERROR
     if current == BranchServiceStatus.STARTING and derived == BranchServiceStatus.STOPPED:
         logger.debug("Ignoring STARTING -> STOPPED transition detected by branch status monitor")
         return False
@@ -288,12 +277,22 @@ async def refresh_branch_status(branch_id: Identifier) -> BranchServiceStatus:
         return new_status
 
 
-async def _refresh_branch_status(branch: Branch) -> BranchServiceStatus:
+def _active_task_status(branch: Branch) -> BranchServiceStatus | None:
+    """Return the in-progress status for the running task, or None if idle."""
     if branch.control_task_id is not None:
         result = perform_control.AsyncResult(str(branch.control_task_id))
         action = (result.kwargs or {}).get("action")
         if action in _CONTROL_TRANSITION_INITIAL:
             return _CONTROL_TRANSITION_INITIAL[action]
+    if branch.resize_task_id is not None:
+        return BranchServiceStatus.RESIZING
+    return None
+
+
+async def _refresh_branch_status(branch: Branch) -> BranchServiceStatus:
+    in_progress = _active_task_status(branch)
+    if in_progress is not None:
+        return in_progress
 
     current_status = _parse_branch_status(branch.status)
     status = deployment_status(branch.id)
@@ -304,8 +303,7 @@ async def _refresh_branch_status(branch: Branch) -> BranchServiceStatus:
         status,
     )
 
-    resize_in_progress = branch.resize_task_id is not None
-    if _should_update_branch_status(current_status, status, resize_in_progress=resize_in_progress):
+    if _should_update_branch_status(current_status, status):
         branch.set_status(status)
         return status
 
@@ -1898,7 +1896,6 @@ async def resize(
 
     task_id = dispatch_resize(str(branch.id), dict(effective_parameters))
 
-    branch.set_status(BranchServiceStatus.RESIZING)
     branch.resize_task_id = task_id
     await session.commit()
 

src/api/organization/project/branch/resize_tasks.py

@@ -17,7 +17,7 @@
 from .....database import AsyncSessionLocal
 from .....deployment.health import collect_branch_service_health, derive_branch_status_from_services
 from .....deployment.resize import resize_cpu_memory, resize_database_pvc, resize_iops, resize_storage_pvc
-from .....models.branch import Branch, BranchServiceStatus
+from .....models.branch import Branch
 from .....models.resources import ResourceLimitsPublic
 from .....worker import app
 from ...._util.resourcelimit import apply_branch_resource_allocation
@@ -85,11 +85,9 @@ async def _async_finalize_resize(
         await _apply_succeeded_fields(session, branch, succeeded)
 
         service_status = await collect_branch_service_health(branch.id)
-        if branch.status == BranchServiceStatus.RESIZING:
-            branch.set_status(
-                derive_branch_status_from_services(service_status, storage_enabled=branch.enable_file_storage)
-            )
-
+        branch.set_status(
+            derive_branch_status_from_services(service_status, storage_enabled=branch.enable_file_storage)
+        )
         branch.resize_task_id = None
         await session.commit()