unified insert path for periodic jobs #679
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Job insert middleware were not being utilized for periodic jobs, resulting in behavioral differences (especially Pro features). This insertion path has been refactored to rely on the unified insertion path from the client. Fixes #675.
bgentry
commented
Nov 16, 2024
| // insertMany is a shared code path for InsertMany and InsertManyTx, also used | ||
| // by the PeriodicJobEnqueuer. | ||
| func (c *Client[TTx]) insertMany(ctx context.Context, tx riverdriver.ExecutorTx, insertParams []*rivertype.JobInsertParams) ([]*rivertype.JobInsertResult, error) { | ||
| return c.insertManyShared(ctx, tx, insertParams, func(ctx context.Context, insertParams []*riverdriver.JobInsertFastParams) ([]*rivertype.JobInsertResult, error) { |
There was a problem hiding this comment.
The nesting in here is getting a bit unwieldy and is probably worth spending some more time to refactor. For now though I want to get this bug fixed quickly due to its impact on pro features.
Comment on lines
-353
to
-365
| for _, result := range results { | ||
| if !result.UniqueSkippedAsDuplicate { | ||
| queues = append(queues, result.Job.Queue) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if len(queues) > 0 { | ||
| if err := s.Config.NotifyInsert(ctx, tx, queues); err != nil { | ||
| s.Logger.ErrorContext(ctx, s.Name+": Error notifying insert", "error", err.Error()) | ||
| return | ||
| } | ||
| s.TestSignals.NotifiedQueues.Signal(queues) |
There was a problem hiding this comment.
I like that this change ended up simplifying some things, like not needing to deal with insert notifications in the PeriodicJobEnqueuer anymore. Now it's all the same insert logic as the Client.
tigrato
pushed a commit
to gravitational/river
that referenced
this pull request
Dec 18, 2024
Job insert middleware were not being utilized for periodic jobs, resulting in behavioral differences (especially Pro features). This insertion path has been refactored to rely on the unified insertion path from the client. Fixes riverqueue#675.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Job insert middleware were not being utilized for periodic jobs, resulting in behavioral differences (especially Pro features). This periodic job insertion path has been refactored to utilize the unified insertion path from the client, which also makes these inserts pass through the Pilot instead of going directly to the driver.
Fixes #675.