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/delete.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/federation/federatingdb/delete.go') diff --git a/internal/federation/federatingdb/delete.go b/internal/federation/federatingdb/delete.go index fb967fce9..17a25e956 100644 --- a/internal/federation/federatingdb/delete.go +++ b/internal/federation/federatingdb/delete.go @@ -36,7 +36,7 @@ import ( // Protocol instead call Update to create a Tombstone. // // The library makes this call only after acquiring a lock first. -func (f *federatingDB) Delete(ctx context.Context, id *url.URL) error { +func (f *DB) Delete(ctx context.Context, id *url.URL) error { log.DebugKV(ctx, "id", id) activityContext := getActivityContext(ctx) @@ -87,7 +87,7 @@ func (f *federatingDB) Delete(ctx context.Context, id *url.URL) error { return nil } -func (f *federatingDB) deleteAccount( +func (f *DB) deleteAccount( ctx context.Context, requesting *gtsmodel.Account, receiving *gtsmodel.Account, @@ -126,7 +126,7 @@ func (f *federatingDB) deleteAccount( return false, nil } -func (f *federatingDB) deleteStatus( +func (f *DB) deleteStatus( ctx context.Context, requesting *gtsmodel.Account, receiving *gtsmodel.Account, -- cgit v1.2.3