Skip to content

Apply query timeout while waiting for execution lock#221

Merged
penberg merged 1 commit into
mainfrom
high-query-timeout
Jun 1, 2026
Merged

Apply query timeout while waiting for execution lock#221
penberg merged 1 commit into
mainfrom
high-query-timeout

Conversation

@penberg

@penberg penberg commented May 20, 2026

Copy link
Copy Markdown
Contributor

The execution_lock introduced in #218 serializes operations on a
connection, but the query timeout was registered only after the lock
was acquired. Operations that piled up behind a busy connection could
wait many seconds in the queue while the configured timeout (e.g.
500ms) never fired, because the deadline only covered actual execution
time.

Fix: bound the lock wait by the query timeout via tokio::time::timeout
and register the time remaining against the absolute deadline with
QueryTimeoutManager once the lock is acquired. If the deadline
elapses while waiting, surface SQLITE_INTERRUPT — the same error a
user sees when a timeout fires during execution.

For prepare()'s stale-interrupt retry, the timeout guard is now
dropped before clear_stale_interrupt() and a fresh guard is registered
for the retry. If the deadline has already passed at re-register time,
register_remaining_timeout() returns SQLITE_INTERRUPT, so a stale
interrupt can no longer silently swallow our own timeout.

A reproducer is included at perf/query-timeout.js: with the fix, the
100×10 concurrent batch from the bug report finishes in ~5s with the
backlog cleanly timing out, vs ~200s wall time and zero interrupts
before.

The execution_lock introduced in #218 serializes operations on a
connection, but the query timeout was registered only after the lock
was acquired. Operations that piled up behind a busy connection could
wait many seconds in the queue while the configured timeout (e.g.
500ms) never fired, because the deadline only covered actual execution
time.

Fix: bound the lock wait by the query timeout via tokio::time::timeout
and register the time remaining against the absolute deadline with
QueryTimeoutManager once the lock is acquired. If the deadline
elapses while waiting, surface SQLITE_INTERRUPT — the same error a
user sees when a timeout fires during execution.

For prepare()'s stale-interrupt retry, the timeout guard is now
dropped before clear_stale_interrupt() and a fresh guard is registered
for the retry. If the deadline has already passed at re-register time,
register_remaining_timeout() returns SQLITE_INTERRUPT, so a stale
interrupt can no longer silently swallow our own timeout.

A reproducer is included at perf/query-timeout.js: with the fix, the
100×10 concurrent batch from the bug report finishes in ~5s with the
backlog cleanly timing out, vs ~200s wall time and zero interrupts
before.
@penberg penberg force-pushed the high-query-timeout branch from 60a4f86 to 8f7ce0f Compare June 1, 2026 08:44
@penberg penberg merged commit a1b7ef3 into main Jun 1, 2026
25 of 26 checks passed
@penberg penberg deleted the high-query-timeout branch June 1, 2026 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant