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/reject.go | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'internal/federation/federatingdb/reject.go') diff --git a/internal/federation/federatingdb/reject.go b/internal/federation/federatingdb/reject.go index 1c657a5a9..5ec3b1a27 100644 --- a/internal/federation/federatingdb/reject.go +++ b/internal/federation/federatingdb/reject.go @@ -33,7 +33,7 @@ import ( "code.superseriousbusiness.org/gotosocial/internal/uris" ) -func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsReject) error { +func (f *DB) Reject(ctx context.Context, reject vocab.ActivityStreamsReject) error { log.DebugKV(ctx, "reject", serialize{reject}) activityContext := getActivityContext(ctx) @@ -122,7 +122,7 @@ func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsR return nil } -func (f *federatingDB) rejectFollowType( +func (f *DB) rejectFollowType( ctx context.Context, asType vocab.Type, receivingAcct *gtsmodel.Account, @@ -138,11 +138,6 @@ func (f *federatingDB) rejectFollowType( return gtserror.NewErrorInternalError(err) } - // Lock on the Follow URI - // as we may be updating it. - unlock := f.state.FedLocks.Lock(follow.URI) - defer unlock() - // Make sure the creator of the original follow // is the same as whatever inbox this landed in. if follow.AccountID != receivingAcct.ID { @@ -158,8 +153,7 @@ func (f *federatingDB) rejectFollowType( } // Reject the follow. - err = f.state.DB.RejectFollowRequest( - ctx, + err = f.state.DB.RejectFollowRequest(ctx, follow.AccountID, follow.TargetAccountID, ) @@ -171,17 +165,12 @@ func (f *federatingDB) rejectFollowType( return nil } -func (f *federatingDB) rejectFollowIRI( +func (f *DB) rejectFollowIRI( ctx context.Context, objectIRI string, receivingAcct *gtsmodel.Account, requestingAcct *gtsmodel.Account, ) error { - // Lock on this potential Follow - // URI as we may be updating it. - unlock := f.state.FedLocks.Lock(objectIRI) - defer unlock() - // Get the follow req from the db. followReq, err := f.state.DB.GetFollowRequestByURI(ctx, objectIRI) if err != nil && !errors.Is(err, db.ErrNoEntries) { @@ -214,8 +203,7 @@ func (f *federatingDB) rejectFollowIRI( } // Reject the follow. - err = f.state.DB.RejectFollowRequest( - ctx, + err = f.state.DB.RejectFollowRequest(ctx, followReq.AccountID, followReq.TargetAccountID, ) @@ -227,7 +215,7 @@ func (f *federatingDB) rejectFollowIRI( return nil } -func (f *federatingDB) rejectStatusIRI( +func (f *DB) rejectStatusIRI( ctx context.Context, activityID string, objectIRI string, @@ -379,7 +367,7 @@ func (f *federatingDB) rejectStatusIRI( return nil } -func (f *federatingDB) rejectLikeIRI( +func (f *DB) rejectLikeIRI( ctx context.Context, activityID string, objectIRI string, -- cgit v1.2.3