Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: jobs not draining as fast as we'd like because of rate-limiting etc. #4327

Merged
merged 3 commits into from
Feb 7, 2024

Conversation

Sidddddarth
Copy link
Member

@Sidddddarth Sidddddarth commented Jan 17, 2024

Description

Drain router jobs faster. Done by sending the job to worker in case of backoff or throttling whereas it was discarded earlier.

Linear Ticket

slack thread
Resolves PIPE-713

Security

  • The code changed/added as part of this pull request won't create any security issues with how the software is being used.

Copy link
Contributor

coderabbitai bot commented Jan 17, 2024

Important

Auto Review Skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

@Sidddddarth Sidddddarth changed the title chore: jobs not draining as fast as we'd like because of rate-limiting etc. fix: jobs not draining as fast as we'd like because of rate-limiting etc. Jan 17, 2024
@Sidddddarth Sidddddarth force-pushed the chore.drainFast branch 2 times, most recently from 28d2967 to 67efbd4 Compare January 22, 2024 05:31
Copy link

codecov bot commented Jan 22, 2024

Codecov Report

Attention: 7 lines in your changes are missing coverage. Please review.

Comparison is base (0452e5b) 74.02% compared to head (25a309c) 74.02%.
Report is 10 commits behind head on master.

❗ Current head 25a309c differs from pull request most recent head 865d74a. Consider uploading reports for the commit 865d74a to get more accurate results

Files Patch % Lines
router/handle.go 86.53% 5 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4327      +/-   ##
==========================================
- Coverage   74.02%   74.02%   -0.01%     
==========================================
  Files         381      381              
  Lines       54404    54419      +15     
==========================================
+ Hits        40272    40282      +10     
- Misses      11849    11853       +4     
- Partials     2283     2284       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Sidddddarth Sidddddarth force-pushed the chore.drainFast branch 2 times, most recently from 3dd9f84 to 2de63d1 Compare January 23, 2024 14:45
router/handle.go Outdated
@@ -579,7 +585,7 @@ func (rt *Handle) findWorkerSlot(ctx context.Context, workers []*worker, job *jo
return nil, types.ErrBarrierExists
}
rt.logger.Debugf("EventOrder: job %d of orderKey %s is allowed to be processed", job.JobID, orderKey)
if rt.shouldThrottle(ctx, job, parameters) {
if rt.shouldThrottle(ctx, job, parameters) && !abortedJob {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we check if we should throttle before entering the barrier like we do for backoff?

Something like:

  1. if shouldBackoff AND !abortedJob THEN return ErrJobBackoff
  2. if shouldThrottle AND !abortedJob THEN return ErrDestinationThrottled
  3. get worker slot
  4. enter barrier THEN return (ErrBarrierExists OR slot)

Wdyt?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this order(barrier.Enter and then checking if throttled) is being followed for a reason(can't think of one right now).
@atzoum wdyt?

router/handle.go Outdated Show resolved Hide resolved
router/router_test.go Outdated Show resolved Hide resolved
router/handle.go Outdated Show resolved Hide resolved
router/handle.go Outdated Show resolved Hide resolved
Copy link
Contributor

@mihir20 mihir20 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cisse21 cisse21 merged commit bc755cf into master Feb 7, 2024
39 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants