diff options
| author |  kim <grufwub@gmail.com> | 2025-05-15 09:40:48 +0000 |
|---|---|---|
| committer |  kim <gruf@noreply.codeberg.org> | 2025-05-15 09:40:48 +0000 |
| commit | 3cff4b2d7d138f45787a94e6e64acdccb00e8951 (patch) | |
| tree | d18f18289b3082b129d6e129aa383ddde5869521 /internal/federation/federatingdb/undo.go | |
| parent | [chore] Change default database in example config to sqlite, update docs. (#4... (diff) | |
| download | gotosocial-3cff4b2d7d138f45787a94e6e64acdccb00e8951.tar.xz | |
[chore] various federatingdb tweaks (#4178)
after seeing a potential reported federating worker lockup i decided to start digging into the federatingdb code. this PR encompasses:
- removes one of our last unused interface types `federatingdb.DB{}`, replacing it with a struct type `*federatingdb.DB{}`
- in `transport.dereferenceLocal()` differentiates between an unsupported lookup type and ErrNoEntries to reduce unnecessary calls, and reduce potential lockups that may occur while trying to call our own endpoints that then call `federatingdb.Lock()`
- removes a bunch of the locks on follow state changes since the DB already synchronizes that
- removes the unnecessary `pub.Clock{}` struct field and type passed to the transport controller
frankly it would be great if we could remove the locking in `federatingdb.Lock()` and instead handle it ourselves as it gets very confusing trying to figure out what functions will have locks held. but i guess that's one for when we move further away from the go-fed/activity/pub package usage.
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4178
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/federation/federatingdb/undo.go')
| -rw-r--r-- | internal/federation/federatingdb/undo.go | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/internal/federation/federatingdb/undo.go b/internal/federation/federatingdb/undo.go index 5f3678cd8..23c4098dd 100644 --- a/internal/federation/federatingdb/undo.go +++ b/internal/federation/federatingdb/undo.go @@ -32,7 +32,7 @@ import ( "code.superseriousbusiness.org/gotosocial/internal/messages" ) -func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error { +func (f *DB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error { log.DebugKV(ctx, "undo", serialize{undo}) activityContext := getActivityContext(ctx) @@ -111,7 +111,7 @@ func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) return nil } -func (f *federatingDB) undoFollow( +func (f *DB) undoFollow( ctx context.Context, receivingAcct *gtsmodel.Account, requestingAcct *gtsmodel.Account, @@ -149,11 +149,6 @@ func (f *federatingDB) undoFollow( return nil } - // Lock on the Follow URI - // as we may be updating it. - unlock := f.state.FedLocks.Lock(follow.URI) - defer unlock() - // Ensure addressee is follow target. if follow.TargetAccountID != receivingAcct.ID { const text = "receivingAcct was not Follow target" @@ -193,7 +188,7 @@ func (f *federatingDB) undoFollow( return nil } -func (f *federatingDB) undoLike( +func (f *DB) undoLike( ctx context.Context, receivingAcct *gtsmodel.Account, requestingAcct *gtsmodel.Account, @@ -293,7 +288,7 @@ func (f *federatingDB) undoLike( return nil } -func (f *federatingDB) undoBlock( +func (f *DB) undoBlock( ctx context.Context, receivingAcct *gtsmodel.Account, requestingAcct *gtsmodel.Account, @@ -363,7 +358,7 @@ func (f *federatingDB) undoBlock( return nil } -func (f *federatingDB) undoAnnounce( +func (f *DB) undoAnnounce( ctx context.Context, receivingAcct *gtsmodel.Account, requestingAcct *gtsmodel.Account, |