Apply query timeout while waiting for execution lock#221
Open
penberg wants to merge 1 commit into
Open
Conversation
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.