wip

Author: jopemachine

src/ai/backend/manager/repositories/deployment/db_source/db_source.py

@@ -20,16 +20,14 @@
 from ai.backend.common.data.endpoint.types import EndpointLifecycle
 from ai.backend.common.data.permission.types import RBACElementType
 from ai.backend.common.exception import DeploymentNameAlreadyExists
-from ai.backend.logging import BraceStyleAdapter
-
-log = BraceStyleAdapter(logging.getLogger(__name__))
 from ai.backend.common.types import (
     MODEL_SERVICE_RUNTIME_PROFILES,
     AccessKey,
     KernelId,
     RuntimeVariant,
     SessionId,
 )
+from ai.backend.logging import BraceStyleAdapter
 from ai.backend.manager.data.agent.types import AgentStatus
 from ai.backend.manager.data.deployment.creator import DeploymentPolicyConfig
 from ai.backend.manager.data.deployment.scale import (
@@ -155,6 +153,8 @@
 )
 from ai.backend.manager.utils import query_userinfo_from_session
 
+log = BraceStyleAdapter(logging.getLogger(__name__))
+
 
 @dataclass
 class EndpointWithRoutesRawData:
@@ -2544,8 +2544,7 @@ async def apply_strategy_mutations(
         async with self._begin_session_read_committed() as db_sess:
             await self._create_routes(db_sess, rollout)
             await self._drain_routes(db_sess, drain)
-            swapped = await self._complete_deployment_revision_swap(db_sess, completed_ids)
-            return swapped
+            return await self._complete_deployment_revision_swap(db_sess, completed_ids)
 
     @staticmethod
     async def _create_routes(

src/ai/backend/manager/sokovan/deployment/strategy/rolling_update.py

@@ -246,11 +246,7 @@ def _compute_routes_to_terminate(
         """
         available_count = len(classified.new_healthy) + len(classified.old_active)
         can_terminate = available_count - min_available
-        to_terminate = max(
-            0, min(can_terminate, len(classified.old_active))
-        )  # clamp to actual old count
-
-        return to_terminate
+        return max(0, min(can_terminate, len(classified.old_active)))  # clamp to actual old count
 
 
 def _build_route_creators(