From 3cff4b2d7d138f45787a94e6e64acdccb00e8951 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 15 May 2025 09:40:48 +0000 Subject: [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 Co-committed-by: kim --- internal/federation/federatingdb/db.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'internal/federation/federatingdb/db.go') diff --git a/internal/federation/federatingdb/db.go b/internal/federation/federatingdb/db.go index 539305204..0c4d21c64 100644 --- a/internal/federation/federatingdb/db.go +++ b/internal/federation/federatingdb/db.go @@ -32,9 +32,10 @@ import ( "codeberg.org/gruf/go-cache/v3/simple" ) -// DB wraps the pub.Database interface with -// a couple of custom functions for GoToSocial. -type DB interface { +// Check our type's +// interface conformity. +var _ interface { + // Default // functionality. pub.Database @@ -55,11 +56,11 @@ type DB interface { */ GetAccept(ctx context.Context, acceptIRI *url.URL) (vocab.ActivityStreamsAccept, error) -} +} = &DB{} -// FederatingDB uses the given state interface -// to implement the go-fed pub.Database interface. -type federatingDB struct { +// DB uses the given state interface to +// implement the go-fed pub.Database interface. +type DB struct { state *state.State converter *typeutils.Converter visFilter *visibility.Filter @@ -79,8 +80,8 @@ func New( visFilter *visibility.Filter, intFilter *interaction.Filter, spamFilter *spam.Filter, -) DB { - fdb := federatingDB{ +) *DB { + fdb := DB{ state: state, converter: converter, visFilter: visFilter, @@ -93,6 +94,6 @@ func New( // storeActivityID stores an entry in the .activityIDs cache for this // type's JSON-LD ID, for later checks in Exist() to mark it as seen. -func (f *federatingDB) storeActivityID(asType vocab.Type) { +func (f *DB) storeActivityID(asType vocab.Type) { f.activityIDs.Set(ap.GetJSONLDId(asType).String(), struct{}{}) } -- cgit v1.2.3