Don't count job as in progress if a different strategy throttles it #222
Conversation
This file contains hidden or 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
This spec fails if the dynamic rule is specified after the static rule. In this case when `throttle?` is called for the 4th job with the arg `99` the static rule returns `false` and adds the job to the in progress set, but the dynamic rule then returns `true`, so the job should not be executed. If the order the rules are configured is reversed then dynamic rule will execute first, return `true`, and the static rule will never run so the job will not be added to the in progress set.
When a later strategy throttles the job. This removes the job from the in progress set, since it is not actually running.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #222 +/- ##
==========================================
+ Coverage 98.97% 98.98% +0.01%
==========================================
Files 19 19
Lines 486 493 +7
Branches 85 87 +2
==========================================
+ Hits 481 488 +7
Misses 5 5 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When strategies are given in an array
throttled?is called in order for each strategy in the array. When it is called for one concurrency strategy and evaluates tofalseit always adds the job to the in progress set. But if it evaluates totruefor a later strategy then the job will not actually be executed.This PR fixes this bug by calling
finalize!on each strategy thatthrottled?was already called on, removing the job from their in progress sets. This is a similar to howStrategy#throttled?already callsfinalize!on its concurrency strategies that were already evaluated if the threshold strategy throttles the job.It seems inefficient to add each job to sets only to immediately remove it. A possibly more efficient approach is shown in CJStadler@12c4f35689020. That would require more extensive changes though.
Fixes #220