Skip to content

Fix monitors stuck procedure query #97

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
GabrielSalla merged 1 commit into from
Jun 19, 2025
Merged

Fix monitors stuck procedure query #97

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/components/controller/procedures/sql_files/monitors_stuck.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ with monitors as (
extract(epoch from current_timestamp - last_heartbeat) :: int as time_since_last_heartbeat
from "Monitors"
where
enabled and (queued or running)
enabled and
(queued or running) and
coalesce(queued_at < current_timestamp - ($1 :: int) * interval '1 second', true) and
coalesce(running_at < current_timestamp - ($1 :: int) * interval '1 second', true)
)
select id
from monitors
Expand Down
11 changes: 10 additions & 1 deletion tests/components/controller/procedures/test_monitors_stuck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ def get_time(reference: str) -> datetime | None:
values = {
"now": now(),
"ten_seconds_ago": now() - timedelta(seconds=11),
"five_minutes_ago": now() - timedelta(seconds=301),
}
return values.get(reference)

Expand All @@ -28,19 +27,25 @@ async def test_configuration():
@pytest.mark.parametrize("enabled", [False, True])
@pytest.mark.parametrize("queued", [False, True])
@pytest.mark.parametrize("running", [False, True])
@pytest.mark.parametrize("queued_at", [None, "now", "ten_seconds_ago"])
@pytest.mark.parametrize("running_at", [None, "now", "ten_seconds_ago"])
@pytest.mark.parametrize("last_heartbeat", [None, "now", "ten_seconds_ago"])
async def test_monitors_stuck(
caplog,
sample_monitor: Monitor,
enabled,
queued,
running,
queued_at,
running_at,
last_heartbeat,
):
"""'monitors_stuck' should fix monitors that are stuck"""
sample_monitor.enabled = enabled
sample_monitor.queued = queued
sample_monitor.running = running
sample_monitor.queued_at = get_time(queued_at) # type:ignore[assignment]
sample_monitor.running_at = get_time(running_at) # type:ignore[assignment]
sample_monitor.last_heartbeat = get_time(last_heartbeat) # type:ignore[assignment]
await sample_monitor.save()

Expand All @@ -52,6 +57,10 @@ async def test_monitors_stuck(
triggered = False
elif last_heartbeat is None:
triggered = False
elif queued_at == "now":
triggered = False
elif running_at == "now":
triggered = False
elif last_heartbeat == "now":
triggered = False
else:
Expand Down