日誌庫 SQLite busy_timeout 與批量寫入重試（3.105.0-rc10）

Made-with: Cursor

Author: Ryan Mitchell

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 所有重要的專案更新都會記錄在此檔案中。
 
+## [3.105.0-rc10] - 2026-04-21
+
+### Fixed
+- **日志庫 SQLite**：連接 DSN 增加 **`_busy_timeout=15000`**；**`batchInsert`** 對 `database is locked` / busy 類錯誤做短重試，減輕高併發下「批量写入日志失败: database is locked」。
+
+---
+
 ## [3.105.0-rc9] - 2026-04-21
 
 ### Fixed

main.go

@@ -45,7 +45,7 @@ import (
 )
 
 // Version 应用版本号
-var Version = "3.105.0-rc9"
+var Version = "3.105.0-rc10"
 
 // capitalDataSourceAdapter 资金數據源适配器
 type capitalDataSourceAdapter struct {

storage/log_storage.go

@@ -72,9 +72,14 @@ func NewLogStorage(path string) (*LogStorage, error) {
 	return ls, nil
 }
 
+// logSQLiteDSN WAL + busy_timeout，避免與其它連接短暫競爭時出現 database is locked
+func logSQLiteDSN(path string) string {
+	return path + "?_journal_mode=WAL&_synchronous=NORMAL&_busy_timeout=15000"
+}
+
 // openLogStorageDB 打开數據库，若完整性检查失败则备份並重建
 func openLogStorageDB(path string) (*sql.DB, *LogStorage, error) {
-	dsn := path + "?_journal_mode=WAL&_synchronous=NORMAL"
+	dsn := logSQLiteDSN(path)
 	db, err := sql.Open("sqlite3", dsn)
 	if err != nil {
 		return nil, nil, fmt.Errorf("打开日志數據库失败: %w", err)
@@ -278,13 +283,43 @@ func (ls *LogStorage) processLogs() {
 	}
 }
 
-// batchInsert 批量插入日志
+func sqliteLogLockedRetryable(err error) bool {
+	if err == nil {
+		return false
+	}
+	msg := strings.ToLower(err.Error())
+	return strings.Contains(msg, "database is locked") || strings.Contains(msg, "locked") ||
+		strings.Contains(msg, "busy")
+}
+
+// batchInsert 批量插入日志（對 SQLITE_BUSY / locked 短重試，配合 DSN busy_timeout）
 func (ls *LogStorage) batchInsert(entries []*logEntry) error {
 	if len(entries) == 0 {
 		return nil
 	}
+	const maxAttempts = 6
+	var lastErr error
+	for attempt := 0; attempt < maxAttempts; attempt++ {
+		if attempt > 0 {
+			time.Sleep(time.Duration(20+attempt*25) * time.Millisecond)
+		}
+		lastErr = ls.batchInsertOnce(entries)
+		if lastErr == nil {
+			return nil
+		}
+		if !sqliteLogLockedRetryable(lastErr) {
+			return lastErr
+		}
+	}
+	return lastErr
+}
+
+// batchInsertOnce 單次事務批量插入
+func (ls *LogStorage) batchInsertOnce(entries []*logEntry) error {
+	if len(entries) == 0 {
+		return nil
+	}
 
-	// 使用事務批量插入
 	tx, err := ls.db.Begin()
 	if err != nil {
 		return err
@@ -307,7 +342,6 @@ func (ls *LogStorage) batchInsert(entries []*logEntry) error {
 			return err
 		}
 
-		// 獲取插入的 ID
 		id, _ := result.LastInsertId()
 		insertedLogs = append(insertedLogs, &LogRecord{
 			ID:        id,
@@ -322,7 +356,6 @@ func (ls *LogStorage) batchInsert(entries []*logEntry) error {
 		return err
 	}
 
-	// 通知所有订阅者
 	ls.notifySubscribers(insertedLogs)
 
 	return nil

storage/log_storage_filter_test.go

@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"errors"
 	"path/filepath"
 	"testing"
 	"time"
@@ -61,3 +62,18 @@ func TestLogStorage_GetLogs_OptionalMessageFilters(t *testing.T) {
 		t.Fatalf("AND of column bot_id + message filters should exclude mismatch, got total=%d", total)
 	}
 }
+
+func TestSqliteLogLockedRetryable(t *testing.T) {
+	if !sqliteLogLockedRetryable(errors.New("database is locked")) {
+		t.Fatal("expected locked message retryable")
+	}
+	if !sqliteLogLockedRetryable(errors.New("SQLITE_BUSY")) {
+		t.Fatal("expected busy retryable")
+	}
+	if sqliteLogLockedRetryable(nil) {
+		t.Fatal("nil should not retry")
+	}
+	if sqliteLogLockedRetryable(errors.New("constraint failed")) {
+		t.Fatal("constraint should not retry")
+	}
+}

webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quantmesh-webui",
-  "version": "3.105.0-rc9",
+  "version": "3.105.0-rc10",
   "type": "module",
   "packageManager": "yarn@4.12.0",
   "scripts": {