From c9c0773f2c2363dcfa37e675b83ec3f0b49bd0d9 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:50:46 +0100 Subject: [performance] update remaining worker pools to use queues (#2865) * start replacing client + federator + media workers with new worker + queue types * refactor federatingDB.Delete(), drop queued messages when deleting account / status * move all queue purging to the processor workers * undo toolchain updates * code comments, ensure dereferencer worker pool gets started * update gruf libraries in readme * start the job scheduler separately to the worker pools * reshuffle ordering or server.go + remove duplicate worker start / stop * update go-list version * fix vendoring * move queue invalidation to before wipeing / deletion, to ensure queued work not dropped * add logging to worker processing functions in testrig, don't start workers in unexpected places * update go-structr to add (+then rely on) QueueCtx{} type * ensure more worker pools get started properly in tests * fix remaining broken tests relying on worker queue logic * fix account test suite queue popping logic, ensure noop workers do not pull from queue * move back accidentally shuffled account deletion order * ensure error (non nil!!) gets passed in refactored federatingDB{}.Delete() * silently drop deletes from accounts not permitted to * don't warn log on forwarded deletes * make if else clauses easier to parse * use getFederatorMsg() * improved code comment * improved code comment re: requesting account delete checks * remove boolean result from worker start / stop since false = already running or already stopped * remove optional passed-in http.client * remove worker starting from the admin CLI commands (we don't need to handle side-effects) * update prune cli to start scheduler but not all of the workers * fix rebase issues * remove redundant return statements * i'm sorry sir linter --- internal/processing/status/boost.go | 12 ++++++------ internal/processing/status/create.go | 4 ++-- internal/processing/status/delete.go | 6 +++--- internal/processing/status/fave.go | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'internal/processing/status') diff --git a/internal/processing/status/boost.go b/internal/processing/status/boost.go index 5fae695fd..1c1da4ca7 100644 --- a/internal/processing/status/boost.go +++ b/internal/processing/status/boost.go @@ -89,12 +89,12 @@ func (p *Processor) BoostCreate( } // Process side effects asynchronously. - p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{ + p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{ APObjectType: ap.ActivityAnnounce, APActivityType: ap.ActivityCreate, GTSModel: boost, - OriginAccount: requester, - TargetAccount: target.Account, + Origin: requester, + Target: target.Account, }) return p.c.GetAPIStatus(ctx, requester, boost) @@ -141,12 +141,12 @@ func (p *Processor) BoostRemove( if boost != nil { // Status was boosted. Process unboost side effects asynchronously. - p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{ + p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{ APObjectType: ap.ActivityAnnounce, APActivityType: ap.ActivityUndo, GTSModel: boost, - OriginAccount: requester, - TargetAccount: target.Account, + Origin: requester, + Target: target.Account, }) } diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index d758fc0fb..80cc65c7f 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -143,11 +143,11 @@ func (p *Processor) Create( } // send it back to the client API worker for async side-effects. - p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{ + p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{ APObjectType: ap.ObjectNote, APActivityType: ap.ActivityCreate, GTSModel: status, - OriginAccount: requester, + Origin: requester, }) if status.Poll != nil { diff --git a/internal/processing/status/delete.go b/internal/processing/status/delete.go index 261086bdb..700909f44 100644 --- a/internal/processing/status/delete.go +++ b/internal/processing/status/delete.go @@ -51,12 +51,12 @@ func (p *Processor) Delete(ctx context.Context, requestingAccount *gtsmodel.Acco } // Process delete side effects. - p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{ + p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{ APObjectType: ap.ObjectNote, APActivityType: ap.ActivityDelete, GTSModel: targetStatus, - OriginAccount: requestingAccount, - TargetAccount: requestingAccount, + Origin: requestingAccount, + Target: requestingAccount, }) return apiStatus, nil diff --git a/internal/processing/status/fave.go b/internal/processing/status/fave.go index 7b71725ab..dd961c082 100644 --- a/internal/processing/status/fave.go +++ b/internal/processing/status/fave.go @@ -107,12 +107,12 @@ func (p *Processor) FaveCreate(ctx context.Context, requestingAccount *gtsmodel. } // Process new status fave side effects. - p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{ + p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{ APObjectType: ap.ActivityLike, APActivityType: ap.ActivityCreate, GTSModel: gtsFave, - OriginAccount: requestingAccount, - TargetAccount: targetStatus.Account, + Origin: requestingAccount, + Target: targetStatus.Account, }) return p.c.GetAPIStatus(ctx, requestingAccount, targetStatus) @@ -137,12 +137,12 @@ func (p *Processor) FaveRemove(ctx context.Context, requestingAccount *gtsmodel. } // Process remove status fave side effects. - p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{ + p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{ APObjectType: ap.ActivityLike, APActivityType: ap.ActivityUndo, GTSModel: existingFave, - OriginAccount: requestingAccount, - TargetAccount: targetStatus.Account, + Origin: requestingAccount, + Target: targetStatus.Account, }) return p.c.GetAPIStatus(ctx, requestingAccount, targetStatus) -- cgit v1.2.3