mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-06 03:57:48 +01:00
filer: a listing over a hard link no longer deadlocks a bounded SQL pool (#11118)
* filer: give the SQL stores' key-value reads their own connections A listing holds the connection its rows are on for the whole iteration, and FilerStoreWrapper calls maybeReadHardLink -> KvGet from inside that iteration, so a hard-linked entry needs a second connection while the first is still busy. Out of one bounded pool that is a deadlock: the listings fill the pool and then wait for a connection none of them will release, and the wrapper's context.WithoutCancel leaves the waiters without a deadline, so the filer stays wedged rather than erroring. The sqlite store shows it at its sharpest -- it allows a single connection, so one listing over one hard-linked entry never returns. On postgres with connection_max_open = 50, 60 concurrent listings over hard-linked entries made no progress at all. Key-value reads now run on their own pool, carved out of connection_max_open rather than added to it, so the operator's cap still bounds what the store opens against the database. An unbounded pool keeps a single pool: nothing can wait there. sqlite's single connection becomes two, one per pool, and its writes get a busy timeout so a write that meets the reader waits instead of failing. Claude-Session: https://claude.ai/code/session_018DWwctzD4T2DmnczPRM47t * sqlite: keep both pools on one database, whatever the dbFile spells A dbFile that already carries URI options got a second "?" appended, which the driver reads as part of the preceding option value, and a bare :memory: is private to each connection, so the key-value pool would open its own empty database and every key-value operation would fail on a missing filemeta. Claude-Session: https://claude.ai/code/session_018DWwctzD4T2DmnczPRM47t * sqlite: assert the busy timeout on the in-memory DSN too Claude-Session: https://claude.ai/code/session_018DWwctzD4T2DmnczPRM47t
This commit is contained in:
1 parent
9b61289293
commit
9f6efc8b53
9 files changed
+228
-35
No files matched your search
@@ -8,6 +8,8 @@ import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/filer"
|
||||
"github.com/seaweedfs/seaweedfs/weed/filer/abstract_sql"
|
||||
@@ -49,6 +51,21 @@ func (store *SqliteStore) Initialize(configuration util.Configuration, prefix st
|
||||
)
|
||||
}
|
||||
|
||||
// sqliteDSN keeps the store's two pools on one database and lets a writer that
|
||||
// meets the other pool's reader wait for it instead of failing outright. A bare
|
||||
// :memory: is private to each connection, so it has to be named and shared.
|
||||
func sqliteDSN(dbFile string) string {
|
||||
dsn := dbFile
|
||||
if dsn == ":memory:" {
|
||||
dsn = fmt.Sprintf("file:seaweedfs%d?mode=memory&cache=shared", time.Now().UnixNano())
|
||||
}
|
||||
separator := "?"
|
||||
if strings.Contains(dsn, "?") {
|
||||
separator = "&"
|
||||
}
|
||||
return dsn + separator + "_pragma=busy_timeout(10000)"
|
||||
}
|
||||
|
||||
func (store *SqliteStore) initialize(dbFile, createTable, upsertQuery string) (err error) {
|
||||
|
||||
store.SupportBucketTable = true
|
||||
@@ -58,21 +75,25 @@ func (store *SqliteStore) initialize(dbFile, createTable, upsertQuery string) (e
|
||||
UpsertQueryTemplate: upsertQuery,
|
||||
}
|
||||
|
||||
var dbErr error
|
||||
store.DB, dbErr = sql.Open("sqlite", dbFile)
|
||||
dsn := sqliteDSN(dbFile)
|
||||
|
||||
db, dbErr := sql.Open("sqlite", dsn)
|
||||
if dbErr != nil {
|
||||
if store.DB != nil {
|
||||
store.DB.Close()
|
||||
store.DB = nil
|
||||
if db != nil {
|
||||
db.Close()
|
||||
}
|
||||
return fmt.Errorf("can not connect to %s error:%v", dbFile, dbErr)
|
||||
}
|
||||
|
||||
if err = store.DB.Ping(); err != nil {
|
||||
if err = db.Ping(); err != nil {
|
||||
return fmt.Errorf("connect to %s error:%v", dbFile, err)
|
||||
}
|
||||
|
||||
store.DB.SetMaxOpenConns(1)
|
||||
if err = store.UseConnectionPools(db, func() (*sql.DB, error) {
|
||||
return sql.Open("sqlite", dsn)
|
||||
}, 1, 1, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = store.CreateTable(context.Background(), abstract_sql.DEFAULT_TABLE); err != nil {
|
||||
return fmt.Errorf("init table %s: %v", abstract_sql.DEFAULT_TABLE, err)
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
//go:build (linux || darwin || windows) && sqlite
|
||||
|
||||
package sqlite
|
||||
|
||||
import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/filer"
|
||||
"github.com/seaweedfs/seaweedfs/weed/util"
|
||||
)
|
||||
|
||||
const (
|
||||
createTableSql = `CREATE TABLE IF NOT EXISTS "%s" (dirhash BIGINT, name VARCHAR(1000), directory TEXT, meta BLOB, PRIMARY KEY (dirhash, name)) WITHOUT ROWID;`
|
||||
upsertQuerySql = `INSERT INTO "%s"(dirhash,name,directory,meta)VALUES(?,?,?,?) ON CONFLICT(dirhash,name) DO UPDATE SET directory=excluded.directory, meta=excluded.meta;`
|
||||
)
|
||||
|
||||
// A listing whose callback reads a hard link needs a second connection while it
|
||||
// still holds the one its rows are on, and the store allows exactly one.
|
||||
func TestListDirectoryOverHardLinkDoesNotDeadlock(t *testing.T) {
|
||||
store := &SqliteStore{}
|
||||
if err := store.initialize(filepath.Join(t.TempDir(), "filer.db"), createTableSql, upsertQuerySql); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer store.Shutdown()
|
||||
|
||||
wrapper := filer.NewFilerStoreWrapper(store)
|
||||
ctx := context.Background()
|
||||
entry := &filer.Entry{
|
||||
FullPath: util.FullPath("/buckets/hlbucket/f0001"),
|
||||
Attr: filer.Attr{Mode: 0644, Mtime: time.Now(), Crtime: time.Now()},
|
||||
HardLinkId: filer.HardLinkId("hardlink-00000001"),
|
||||
}
|
||||
if err := wrapper.InsertEntry(ctx, entry); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
_, err := wrapper.ListDirectoryEntries(ctx, util.FullPath("/buckets/hlbucket"), "", true, 10,
|
||||
func(*filer.Entry) (bool, error) { return true, nil })
|
||||
done <- err
|
||||
}()
|
||||
select {
|
||||
case err := <-done:
|
||||
if err != nil {
|
||||
t.Errorf("list: %v", err)
|
||||
}
|
||||
case <-time.After(10 * time.Second):
|
||||
t.Fatalf("one listing over one hard-linked entry never returned: %+v", store.DB.Stats())
|
||||
}
|
||||
}
|
||||
|
||||
func TestSqliteDSN(t *testing.T) {
|
||||
if got, want := sqliteDSN("/data/filer.db"), "/data/filer.db?_pragma=busy_timeout(10000)"; got != want {
|
||||
t.Errorf("sqliteDSN = %q, want %q", got, want)
|
||||
}
|
||||
if got, want := sqliteDSN("file:/data/filer.db?cache=shared"), "file:/data/filer.db?cache=shared&_pragma=busy_timeout(10000)"; got != want {
|
||||
t.Errorf("sqliteDSN with options = %q, want %q", got, want)
|
||||
}
|
||||
memory := sqliteDSN(":memory:")
|
||||
if !strings.HasPrefix(memory, "file:seaweedfs") || !strings.Contains(memory, "mode=memory&cache=shared") ||
|
||||
!strings.HasSuffix(memory, "&_pragma=busy_timeout(10000)") {
|
||||
t.Errorf("sqliteDSN(:memory:) = %q, want a named shared-memory URI carrying the busy timeout", memory)
|
||||
}
|
||||
}
|
||||
|
||||
// Both pools have to open the same database: the table is created on one and
|
||||
// the key-value operations run on the other.
|
||||
func TestInMemoryStoreSharesOneDatabase(t *testing.T) {
|
||||
store := &SqliteStore{}
|
||||
if err := store.initialize(":memory:", createTableSql, upsertQuerySql); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer store.Shutdown()
|
||||
|
||||
ctx := context.Background()
|
||||
key := []byte("hardlink-00000001")
|
||||
if err := store.KvPut(ctx, key, []byte("value")); err != nil {
|
||||
t.Fatalf("KvPut: %v", err)
|
||||
}
|
||||
value, err := store.KvGet(ctx, key)
|
||||
if err != nil {
|
||||
t.Fatalf("KvGet: %v", err)
|
||||
}
|
||||
if string(value) != "value" {
|
||||
t.Errorf("KvGet = %q, want value", value)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user