[bugfix] Fix possible race condition in federatingdb (#490)

Signed-off-by: kim <grufwub@gmail.com>
This commit is contained in:
kim 2022-04-28 10:18:27 +01:00 committed by GitHub
commit cc5f2e98b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 131 additions and 220 deletions

View file

@ -20,9 +20,8 @@ package federatingdb
import (
"context"
"sync"
"time"
"codeberg.org/gruf/go-mutexes"
"github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/db"
@ -41,9 +40,7 @@ type DB interface {
// FederatingDB uses the underlying DB interface to implement the go-fed pub.Database interface.
// It doesn't care what the underlying implementation of the DB interface is, as long as it works.
type federatingDB struct {
mutex sync.Mutex
locks map[string]*mutex
pool sync.Pool
locks mutexes.MutexMap
db db.DB
typeConverter typeutils.TypeConverter
}
@ -51,29 +48,9 @@ type federatingDB struct {
// New returns a DB interface using the given database and config
func New(db db.DB) DB {
fdb := federatingDB{
mutex: sync.Mutex{},
locks: make(map[string]*mutex, 100),
pool: sync.Pool{New: func() interface{} { return &mutex{} }},
locks: mutexes.NewMap(-1, -1), // use defaults
db: db,
typeConverter: typeutils.NewConverter(db),
}
go fdb.cleanupLocks()
return &fdb
}
func (db *federatingDB) cleanupLocks() {
for {
// Sleep for a minute...
time.Sleep(time.Minute)
// Delete unused locks from map
db.mutex.Lock()
for id, mu := range db.locks {
if !mu.inUse() {
delete(db.locks, id)
db.pool.Put(mu)
}
}
db.mutex.Unlock()
}
}