Skip to content

Commit efa2a91

Browse files
jopemachineclaude
andcommitted
fix(BA-5650-F): align slice F call sites with renamed sokovan fields
- ``SessionWorkload`` now uses ``main_access_key`` / ``owner_id``; the ``PendingSessionData.to_session_workload`` bridge is updated accordingly. - Scheduler db_source constructions of ``SessionDataForPull`` / ``SessionDataForStart`` use the new kwargs. - ``cache_invalidation`` reverts to ``info.access_key`` (``SessionTransitionInfo`` still carries the old field at slice F). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 707fd7b commit efa2a91

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3102,7 +3102,7 @@ async def _get_sessions_for_pull(
31023102
sessions_map[session_id] = SessionDataForPull(
31033103
session_id=session_id,
31043104
creation_id=row.creation_id,
3105-
access_key=row.access_key,
3105+
main_access_key=row.access_key,
31063106
kernels=[],
31073107
)
31083108

@@ -3294,13 +3294,13 @@ async def _get_sessions_for_start(
32943294
SessionDataForStart(
32953295
session_id=session_info["id"],
32963296
creation_id=session_info["creation_id"],
3297-
access_key=session_info["access_key"],
3297+
main_access_key=session_info["access_key"],
32983298
session_type=session_info["session_type"],
32993299
name=session_info["name"],
33003300
cluster_mode=session_info["cluster_mode"],
33013301
kernels=kernel_bindings,
33023302
environ=session_info.get("environ", {}),
3303-
user_uuid=session_info["user_uuid"],
3303+
owner_id=session_info["user_uuid"],
33043304
user_email=user_info.email,
33053305
user_name=user_info.username,
33063306
)
@@ -4074,7 +4074,7 @@ async def _fetch_sessions_for_pull_by_ids(
40744074
sessions_map[session_id] = SessionDataForPull(
40754075
session_id=session_id,
40764076
creation_id=row.creation_id,
4077-
access_key=row.access_key,
4077+
main_access_key=row.access_key,
40784078
kernels=[],
40794079
)
40804080

@@ -4293,13 +4293,13 @@ async def _fetch_sessions_for_start_by_ids(
42934293
SessionDataForStart(
42944294
session_id=session_info["id"],
42954295
creation_id=session_info["creation_id"],
4296-
access_key=session_info["access_key"],
4296+
main_access_key=session_info["access_key"],
42974297
session_type=session_info["session_type"],
42984298
name=session_info["name"],
42994299
cluster_mode=session_info["cluster_mode"],
43004300
kernels=kernel_bindings,
43014301
environ=session_info.get("environ", {}),
4302-
user_uuid=session_info["user_uuid"],
4302+
owner_id=session_info["user_uuid"],
43034303
user_email=user_info.email,
43044304
user_name=user_info.username,
43054305
)
@@ -4369,7 +4369,7 @@ async def search_sessions_with_kernels(
43694369
sessions_map[row.id] = SessionDataForPull(
43704370
session_id=row.id,
43714371
creation_id=row.creation_id,
4372-
access_key=row.access_key,
4372+
main_access_key=row.access_key,
43734373
kernels=[],
43744374
)
43754375

@@ -4625,13 +4625,13 @@ async def search_sessions_with_kernels_and_user(
46254625
SessionDataForStart(
46264626
session_id=session_info["id"],
46274627
creation_id=session_info["creation_id"],
4628-
access_key=session_info["access_key"],
4628+
main_access_key=session_info["access_key"],
46294629
session_type=session_info["session_type"],
46304630
name=session_info["name"],
46314631
cluster_mode=session_info["cluster_mode"],
46324632
kernels=session_info["kernels"],
46334633
environ=session_info.get("environ") or {},
4634-
user_uuid=session_info["user_uuid"],
4634+
owner_id=session_info["user_uuid"],
46354635
user_email=user_info.email,
46364636
user_name=user_info.username,
46374637
)

src/ai/backend/manager/repositories/scheduler/types/session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ def to_session_workload(self) -> SessionWorkload:
6464
kernel_workloads = [k.to_kernel_workload() for k in self.kernels]
6565
return SessionWorkload(
6666
session_id=self.id,
67-
access_key=self.main_access_key,
67+
main_access_key=self.main_access_key,
6868
requested_slots=self.requested_slots,
69-
user_uuid=self.owner_id,
69+
owner_id=self.owner_id,
7070
group_id=self.group_id,
7171
domain_name=self.domain_name,
7272
scaling_group=self.scaling_group_name,

src/ai/backend/manager/sokovan/scheduler/post_processors/cache_invalidation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ async def execute(self, context: PostProcessorContext) -> None:
2727
affected_keys: set[AccessKey] = set()
2828

2929
for info in context.result.successes:
30-
if info.main_access_key:
31-
affected_keys.add(info.main_access_key)
30+
if info.access_key:
31+
affected_keys.add(info.access_key)
3232
for info in context.result.failures:
33-
if info.main_access_key:
34-
affected_keys.add(info.main_access_key)
33+
if info.access_key:
34+
affected_keys.add(info.access_key)
3535

3636
if affected_keys:
3737
await self._repository.invalidate_kernel_related_cache(list(affected_keys))

0 commit comments

Comments
 (0)