Skip to content

Fix deadlock when canceling queries stuck in VDBE or busy handler #343

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

Open
mjc wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Fix deadlock when canceling queries stuck in VDBE or busy handler #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f799ff6
Add cancellation test suite for deadlock prevention
mjc Feb 25, 2026
603349b
Call interrupt before close in disconnect to fix deadlock
mjc Feb 25, 2026
7490469
Add platform condvar abstraction and cancellable busy handler
mjc Feb 25, 2026
51fbd51
Add Elixir API for set_busy_timeout and cancel
mjc Feb 25, 2026
c9de8db
Use cancel in disconnect and NIF for set_busy_timeout
mjc Feb 25, 2026
1a9ac04
Add 11 new tests for busy_timeout, set_busy_timeout, and cancel
mjc Feb 25, 2026
f302f47
Update integration test to accept more error outcomes
mjc Feb 25, 2026
533bf74
Fix resource initialization order to prevent UB in destructor
mjc Feb 26, 2026
70c2124
Improve build tracking for C source changes
mjc Feb 26, 2026
4f1df42
Trim verbose C comments
mjc Feb 26, 2026
06d40db
Fix data race on cancelled flag reads
mjc Feb 26, 2026
bdd1521
Remove out-of-memory from acceptable query outcomes
mjc Feb 26, 2026
35a1247
Fix bind_parameter_index/2 return type spec
mjc Feb 26, 2026
5a2979c
mix format: expand case arms in integration test
mjc Feb 26, 2026
53b49a7
Fix duplicate local variable declaration in busy handler
mjc Feb 26, 2026
4daf69c
Restore out-of-memory as valid outcome in timeout test
mjc Feb 26, 2026
fd89402
Replace condvar busy handler with polling via sqlite3_sleep
mjc Mar 16, 2026
bc3beee
fix: clang-format alignment in exqlite_busy_handler
mjc Mar 16, 2026
2cfa8e6
fix: remove stale condvar references in comments
mjc Mar 16, 2026
8d71ee2
fix: address PR review feedback
mjc Apr 25, 2026
5c0a69e
style: format regression tests
mjc Apr 25, 2026
bd26a9b
style: format sqlite3_nif for clang-format
mjc Apr 25, 2026
4a883c2
docs: clarify cancellation and connection options
mjc Apr 26, 2026
04baa4b
Add CI coverage for cancellation regressions
mjc May 6, 2026
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
24 changes: 24 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Copy link
Copy Markdown
Member

@warmwaffles warmwaffles May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this

Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,27 @@ jobs:
- run: mix deps.compile
- run: mix compile
- run: mix test

cancellation-test:
runs-on: ubuntu-latest
env:
MIX_ENV: test
DEBUG: "1"

name: Cancellation regression tests

steps:
- uses: actions/checkout@v6
- uses: erlef/setup-beam@v1
with:
otp-version: "28"
elixir-version: "1.19"
- uses: actions/cache@v5
with:
path: deps
key: ubuntu-latest-otp_28-elixir_1.19-mix_${{ hashFiles('**/mix.lock') }}
restore-keys: ubuntu-latest-otp_28-elixir_1.19-mix_
- run: mix deps.get --only test
- run: mix deps.compile
- run: mix compile
- run: mix test --include slow_test test/exqlite/cancellation_test.exs
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ endif

$(BUILD)/%.o: c_src/%.c
@echo " CC $(notdir $@)"
$(CC) -c $(ERL_CFLAGS) $(CFLAGS) -o $@ $<
$(CC) -c $(ERL_CFLAGS) $(CFLAGS) -MMD -MP -o $@ $<

# Include dependency files for automatic header tracking
-include $(OBJ:.o=.d)

$(LIB_NAME): $(OBJ)
@echo " LD $(notdir $@)"
Expand All @@ -152,7 +155,7 @@ $(PREFIX) $(BUILD):
mkdir -p $@

clean:
$(RM) $(LIB_NAME) $(ARCHIVE_NAME) $(OBJ)
$(RM) $(LIB_NAME) $(ARCHIVE_NAME) $(OBJ) $(OBJ:.o=.d)

.PHONY: all clean

Expand Down
Loading
Loading