Skip to content

fix(history): retain maintenance writer lock through rollback - #1555

Merged
frahlg merged 1 commit into
masterfrom
codex/stable-maintenance-rollback-20261011
Oct 11, 2026
Merged

frahlg merged 1 commit into
masterfrom
codex/stable-maintenance-rollback-20261011

Conversation

@frahlg

@frahlg frahlg commented Oct 11, 2026

Copy link
Copy Markdown
Member

Cancelled archive and hourly backfill transactions can release the history writer mutex while Go is still rolling back the SQLite transaction. A live retry can then meet the old SQLite writer and fail with SQLITE_BUSY.

Keep the writer lock until rollback, connection cleanup and archive busy-timeout restoration finish. Reserve the connection in both hourly paths, as in #1552. Preparation still reads without holding the writer lock.

The regression delegates to real modernc SQLite, performs a real write, expires its context and delays the actual rollback. It checks all three maintenance paths and every pooled connection's restored busy timeout. The archive case fails on master before this fix. Twenty repeated regression runs and five race runs pass, including the existing archive contention and hourly backfill tests. Full make verify passes.

This fixes another cancellation handoff race. It does not establish what caused the first five-second live write delay on v0.140.4-beta.1; #1554 remains a release blocker. This change needs a new beta and a fresh field trial.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 11, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-11T11:15:58.452257Z 01fc7ad PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@frahlg
frahlg merged commit 9c0aeff into master Oct 11, 2026
14 checks passed
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