Update withTx to use BEGIN IMMEDIATE with exponential backoff retry on SQLITE_BUSY errors. This prevents "database is locked" failures during concurrent operations (daemon + CLI, multi-agent workflows). Changes: - withTx now uses beginImmediateWithRetry (same pattern as RunInTransaction) - Add dbExecutor interface for helper functions that work with both *sql.Tx and *sql.Conn - Update all withTx callers to use *sql.Conn - Refactor DeleteIssue to use withTx (fixes the specific error in auto-import) - Update markIssuesDirtyTx to accept dbExecutor interface Affected paths: - MarkIssuesDirty, ClearDirtyIssuesByID (dirty.go) - AddDependency, RemoveDependency (dependencies.go) - executeLabelOperation (labels.go) - AddComment (events.go) - ApplyCompaction (compact.go) - DeleteIssue (queries.go) Note: Some direct BeginTx calls in queries.go (CloseIssue, UpdateIssue, ReopenIssue, DeleteIssues) still use the old pattern and could be refactored in a follow-up. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
167 lines
5.2 KiB
Go
167 lines
5.2 KiB
Go
package sqlite
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// QueryContext exposes the underlying database QueryContext method for advanced queries
|
|
func (s *SQLiteStorage) QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error) {
|
|
return s.db.QueryContext(ctx, query, args...)
|
|
}
|
|
|
|
// BeginTx starts a new database transaction
|
|
// This is used by commands that need to perform multiple operations atomically
|
|
func (s *SQLiteStorage) BeginTx(ctx context.Context) (*sql.Tx, error) {
|
|
return s.db.BeginTx(ctx, nil)
|
|
}
|
|
|
|
// withTx executes a function within a database transaction with retry logic.
|
|
// Uses BEGIN IMMEDIATE with exponential backoff retry on SQLITE_BUSY errors.
|
|
// If the function returns an error, the transaction is rolled back.
|
|
// Otherwise, the transaction is committed.
|
|
//
|
|
// This fixes GH#1272: database lock errors during concurrent operations.
|
|
func (s *SQLiteStorage) withTx(ctx context.Context, fn func(*sql.Conn) error) error {
|
|
// Acquire a dedicated connection for the transaction.
|
|
// This ensures all operations in the transaction use the same connection.
|
|
conn, err := s.db.Conn(ctx)
|
|
if err != nil {
|
|
return wrapDBError("acquire connection", err)
|
|
}
|
|
defer func() { _ = conn.Close() }()
|
|
|
|
// Start IMMEDIATE transaction to acquire write lock early.
|
|
// Use retry logic with exponential backoff to handle SQLITE_BUSY
|
|
if err := beginImmediateWithRetry(ctx, conn, 5, 10*time.Millisecond); err != nil {
|
|
return wrapDBError("begin transaction", err)
|
|
}
|
|
|
|
// Track commit state for cleanup
|
|
committed := false
|
|
defer func() {
|
|
if !committed {
|
|
// Use background context to ensure rollback completes even if ctx is canceled
|
|
_, _ = conn.ExecContext(context.Background(), "ROLLBACK")
|
|
}
|
|
}()
|
|
|
|
// Execute user function
|
|
if err := fn(conn); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Commit the transaction
|
|
if _, err := conn.ExecContext(ctx, "COMMIT"); err != nil {
|
|
return wrapDBError("commit transaction", err)
|
|
}
|
|
committed = true
|
|
return nil
|
|
}
|
|
|
|
// ExecInTransaction is deprecated. Use withTx instead.
|
|
func (s *SQLiteStorage) ExecInTransaction(ctx context.Context, fn func(*sql.Conn) error) error {
|
|
return s.withTx(ctx, fn)
|
|
}
|
|
|
|
// dbExecutor is an interface satisfied by both *sql.Tx and *sql.Conn.
|
|
// This allows helper functions to work with either transaction type.
|
|
type dbExecutor interface {
|
|
ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error)
|
|
QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error)
|
|
QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row
|
|
PrepareContext(ctx context.Context, query string) (*sql.Stmt, error)
|
|
}
|
|
|
|
// IsUniqueConstraintError checks if an error is a UNIQUE constraint violation
|
|
func IsUniqueConstraintError(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
return strings.Contains(err.Error(), "UNIQUE constraint failed")
|
|
}
|
|
|
|
// IsForeignKeyConstraintError checks if an error is a FOREIGN KEY constraint violation
|
|
// This can occur when importing issues that reference deleted issues (e.g., after merge)
|
|
func IsForeignKeyConstraintError(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
errStr := err.Error()
|
|
return strings.Contains(errStr, "FOREIGN KEY constraint failed") ||
|
|
strings.Contains(errStr, "foreign key constraint failed")
|
|
}
|
|
|
|
// IsBusyError checks if an error is a database busy/locked error
|
|
func IsBusyError(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
errStr := err.Error()
|
|
return strings.Contains(errStr, "database is locked") ||
|
|
strings.Contains(errStr, "SQLITE_BUSY")
|
|
}
|
|
|
|
// beginImmediateWithRetry starts an IMMEDIATE transaction with exponential backoff retry
|
|
// on SQLITE_BUSY errors. This addresses bd-ola6: under concurrent write load, BEGIN IMMEDIATE
|
|
// can fail with SQLITE_BUSY, so we retry with exponential backoff instead of failing immediately.
|
|
//
|
|
// Parameters:
|
|
// - ctx: context for cancellation checking
|
|
// - conn: dedicated database connection (must use same connection for entire transaction)
|
|
// - maxRetries: maximum number of retry attempts (default: 5)
|
|
// - initialDelay: initial backoff delay (default: 10ms)
|
|
//
|
|
// Returns error if:
|
|
// - Context is canceled
|
|
// - BEGIN IMMEDIATE fails with non-busy error
|
|
// - All retries exhausted with SQLITE_BUSY
|
|
func beginImmediateWithRetry(ctx context.Context, conn *sql.Conn, maxRetries int, initialDelay time.Duration) error {
|
|
if maxRetries <= 0 {
|
|
maxRetries = 5
|
|
}
|
|
if initialDelay <= 0 {
|
|
initialDelay = 10 * time.Millisecond
|
|
}
|
|
|
|
var lastErr error
|
|
delay := initialDelay
|
|
|
|
for attempt := 0; attempt <= maxRetries; attempt++ {
|
|
// Check context cancellation before each attempt
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Attempt to begin transaction
|
|
_, err := conn.ExecContext(ctx, "BEGIN IMMEDIATE")
|
|
if err == nil {
|
|
return nil // Success
|
|
}
|
|
|
|
lastErr = err
|
|
|
|
// If not a busy error, fail immediately
|
|
if !IsBusyError(err) {
|
|
return err
|
|
}
|
|
|
|
// On last attempt, don't sleep
|
|
if attempt == maxRetries {
|
|
break
|
|
}
|
|
|
|
// Exponential backoff: sleep before retry
|
|
select {
|
|
case <-time.After(delay):
|
|
delay *= 2 // Double the delay for next attempt
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
|
|
return lastErr // Return the last SQLITE_BUSY error after exhausting retries
|
|
}
|