Skip to content

Fix IllegalStateChangeError in delete_metrics task #2639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
un-def merged 1 commit into from
May 15, 2025
Merged

Fix IllegalStateChangeError in delete_metrics task #2639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions src/dstack/_internal/server/background/tasks/process_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import json
from typing import Dict, List, Optional

from sqlalchemy import delete, select
from sqlalchemy import Delete, delete, select
from sqlalchemy.orm import joinedload

from dstack._internal.core.consts import DSTACK_RUNNER_HTTP_PORT
Expand Down Expand Up @@ -49,27 +49,29 @@ async def delete_metrics():
finished_timestamp_micro_cutoff = (
now_timestamp_micro - settings.SERVER_METRICS_FINISHED_TTL_SECONDS * 1_000_000
)
await asyncio.gather(
_execute_delete_statement(
delete(JobMetricsPoint).where(
JobMetricsPoint.job_id.in_(
select(JobModel.id).where(JobModel.status.in_([JobStatus.RUNNING]))
),
JobMetricsPoint.timestamp_micro < running_timestamp_micro_cutoff,
)
),
_execute_delete_statement(
delete(JobMetricsPoint).where(
JobMetricsPoint.job_id.in_(
select(JobModel.id).where(JobModel.status.in_(JobStatus.finished_statuses()))
),
JobMetricsPoint.timestamp_micro < finished_timestamp_micro_cutoff,
)
),
)


async def _execute_delete_statement(stmt: Delete) -> None:
async with get_session_ctx() as session:
await asyncio.gather(
session.execute(
delete(JobMetricsPoint).where(
JobMetricsPoint.job_id.in_(
select(JobModel.id).where(JobModel.status.in_([JobStatus.RUNNING]))
),
JobMetricsPoint.timestamp_micro < running_timestamp_micro_cutoff,
)
),
session.execute(
delete(JobMetricsPoint).where(
JobMetricsPoint.job_id.in_(
select(JobModel.id).where(
JobModel.status.in_(JobStatus.finished_statuses())
)
),
JobMetricsPoint.timestamp_micro < finished_timestamp_micro_cutoff,
)
),
)
await session.execute(stmt)
await session.commit()


Expand Down
Loading