remote/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2026-10-20 00:06:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

execute(): close the cursor in a finally block

Browse source 
A traceback that keeps the frame alive (e.g. QueryInterrupted from a
facet suggestion) kept the statement unfinalized; when the pool later
closed that connection it became a zombie that held its fds until the
next gc. With this, fd cross-check matches in 3/3 N=1000 runs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EwkLo2rJWidpkDVT3HkvNv
This commit is contained in:
Claude 2026-10-04 02:33:54 +00:00
commit b2327f6caa
No known key found for this signature in database
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
datasette/database.py
View file

@ -743,6 +743,7 @@ class Database:
) as execute_span:
try:
with sqlite_timelimit(conn, time_limit_ms):
cursor = None
try:
cursor = conn.cursor()
cursor.execute(sql, params if params is not None else {})
@ -756,6 +757,7 @@ class Database:
else:
rows = cursor.fetchall()
truncated = False
description = cursor.description
except (sqlite3.OperationalError, sqlite3.DatabaseError) as e:
if e.args == ("interrupted",):
raise QueryInterrupted(e, sql, params)
@ -765,6 +767,13 @@ class Database:
)
sys.stderr.flush()
raise
finally:
# Release the statement now: a traceback that
# keeps this frame alive would otherwise keep it
# unfinalized, and closing the pooled connection
# later would leave a zombie holding its fds
if cursor is not None:
cursor.close()
except QueryInterrupted as e:
if not timeout_expected:
execute_span.record_exception(e)
@ -777,10 +786,10 @@ class Database:
raise
if truncate:
return Results(rows, truncated, cursor.description)
return Results(rows, truncated, description)
else:
return Results(rows, False, cursor.description)
return Results(rows, False, description)
with trace( # noqa: SIM117
"sql", database=self.name, sql=sql.strip(), params=params