Skip to content

If there’s no queue concurrency limit, default to the env concurrency limit #1687

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

Merged
merged 1 commit into from
Feb 9, 2025

Conversation

matt-aitken
Copy link
Member

@matt-aitken matt-aitken commented Feb 9, 2025

When dequeuing a run we check that there's enough concurrency to execute it.

Concurrency limits exist at a few layers

  • Org concurrency limit (this will be removed with Run Engine 2+)
  • Environment concurrency limit (this is the limit users pay for, e.g. Hobby is 25)
  • Task/queue concurrency limit (this is defined by users using concurrencyLimit).

If you didn't set concurrencyLimit on your task/custom queue then we previously defaulted it to 1M. This seemed reasonable, as you would be limited by the environment concurrency limit…

But there's an edge case with triggerAndWait where you could accidentally spin up a lot of containers if you hadn't set a concurrencyLimit on the parent and a few other conditions were true. This is related to when we release the concurrency to make runs start as fast as possible for people.

This change defaults the task/queue concurrencyLimit to the environment, if it's not set. This limits the amount of possible containers running to 2x the env concurrency limit.

Summary by CodeRabbit

  • Refactor
    • Updated message processing logic to use dynamic deployment settings for determining concurrency limits.
  • Style
    • Standardized code formatting for improved consistency.

Copy link

changeset-bot bot commented Feb 9, 2025

⚠️ No Changeset found

Latest commit: 767dc5f

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Feb 9, 2025

Walkthrough

This change updates the Lua script in the MarQS module to determine the concurrency limit more dynamically. The fallback value for the dequeueMessage command is now derived from an environment variable (envConcurrencyLimit) instead of a hardcoded constant. A minor formatting update was also applied to the return statement of the calculateQueueCurrentConcurrencies command.

Changes

File Change Summary
apps/webapp/.../index.server.ts Updated dequeueMessage: fallback value for concurrencyLimit changed from '1000000' to envConcurrencyLimit; fixed formatting in calculateQueueCurrentConcurrencies return statement

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant MarQS
    participant Redis

    Client->>MarQS: Call dequeueMessage()
    MarQS->>Redis: GET concurrencyLimitKey
    Redis-->>MarQS: Return value (or nil)
    alt Value exists
        MarQS->>MarQS: Set concurrencyLimit to returned value
    else Nil value
        MarQS->>MarQS: Set concurrencyLimit to envConcurrencyLimit
    end
    MarQS-->>Client: Return message with concurrency limit
Loading

Possibly related PRs

Poem

I'm a hoppy rabbit in the code field bright,
Skipping through scripts with a joyful byte,
Hardcoded values now hop away,
envConcurrencyLimit leads the way,
Bugs nibble no more in my playful sight!
🐰💻

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/webapp/app/v3/marqs/index.server.ts

Oops! Something went wrong! :(

ESLint: 8.45.0

ESLint couldn't find the config "custom" to extend from. Please check that the name of the config is correct.

The config "custom" was referenced from the config file in "/.eslintrc.js".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2771fd7 and 767dc5f.

📒 Files selected for processing (1)
  • apps/webapp/app/v3/marqs/index.server.ts (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: units / 🧪 Unit Tests
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - npm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)
  • GitHub Check: typecheck / typecheck
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (3)
apps/webapp/app/v3/marqs/index.server.ts (3)

1267-1267: LGTM! This change aligns with the PR objectives.

The modification to use envConcurrencyLimit as the fallback value instead of a hardcoded 1000000 is a good improvement. This ensures that if a task or queue doesn't have a specified concurrency limit, it will default to the environment's concurrency limit, preventing potential resource issues from launching too many containers.


1437-1437: LGTM! Minor formatting improvement.

Removed trailing whitespace from the return statement.


1232-1272: 🏁 Script executed:

#!/bin/bash
# Search for tests that verify concurrency limit edge cases
rg -A 5 "test.*concurrency.*limit" test_coderabbit_num.py

Length of output: 122

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • 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 testing code 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • 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/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@matt-aitken matt-aitken merged commit bc7d445 into main Feb 9, 2025
11 checks passed
@matt-aitken matt-aitken deleted the queue-concurrency-defaults-to-env branch February 9, 2025 21:34
@coderabbitai coderabbitai bot mentioned this pull request Feb 17, 2025
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.

1 participant