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

When deploying, batch the "Waiting for deploy runs #1693

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

matt-aitken
Copy link
Member

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

Summary by CodeRabbit

  • New Features

    • Introduced advanced configuration settings to fine-tune deployment batching behavior.
  • Refactor

    • Optimized task scheduling logic by refining data retrieval, sorting, and processing flows to enhance overall efficiency.

Copy link

changeset-bot bot commented Feb 11, 2025

⚠️ No Changeset found

Latest commit: ae0c373

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 11, 2025

Walkthrough

This pull request adds two new integer properties to the application’s environment configuration for the legacy run engine, allowing finer control over deployment batching behavior. Additionally, the task execution service is updated to streamline the data retrieval and processing logic. The changes include selecting only the slug for background worker tasks, introducing a new constant for limiting task runs sourced from the environment, reordering query results by creation timestamp, and directly awaiting message enqueuing without using complex batching arrays.

Changes

File Change Summary
apps/webapp/app/env.server.ts Added two new properties to EnvironmentSchema: LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE (coerced integer, default 100) and LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_STAGGER_MS (coerced integer, default 1000).
apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts Updated ExecuteTasksWaitingForDeployService by modifying the background worker query to select only the slug, introducing a maxCount constant from the newly added env variable, reordering the runsWaitingForDeploy query to sort by createdAt, and streamlining task run processing by directly awaiting the enqueueMessage call without batch promise handling.

Sequence Diagram(s)

sequenceDiagram
    participant Caller as Caller
    participant Service as ExecuteTasksWaitingForDeployService
    participant DB as Database
    participant Enqueue as EnqueueMessage

    Caller->>Service: call()
    Service->>Service: Retrieve maxCount from env (LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE)
    Service->>DB: Query runsWaitingForDeploy (ordered by createdAt, select fields)
    DB-->>Service: Return task runs
    loop For each task run
        Service->>Enqueue: enqueueMessage(run)
        Enqueue-->>Service: Acknowledge message
    end
    alt Number of runs > maxCount
        Service->>Service: Trigger static enqueue for further processing
    end
    Service-->>Caller: Return execution result
Loading

Possibly related PRs

Poem

I’m a curious rabbit with paws so light,
Hopping through code in the soft moonlight.
New properties sprout like carrots in a row,
Tasks line up neatly, ready to go.
With every change, my joy does grow—
Code and carrots, a delightful show!

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/env.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.

apps/webapp/app/v3/services/executeTasksWaitingForDeploy.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 a50b93f and ae0c373.

📒 Files selected for processing (2)
  • apps/webapp/app/env.server.ts (1 hunks)
  • apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts (5 hunks)
🔇 Additional comments (6)
apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts (5)

6-6: LGTM!

The import is necessary for accessing the new environment configuration.


21-25: LGTM! Good performance optimization.

Selecting only the slug field reduces the amount of data retrieved from the database.


34-56: LGTM! Query improvements enhance reliability and performance.

Good improvements:

  1. Using environment variable for batch size configuration
  2. Switching to createdAt for more reliable ordering
  3. Explicitly selecting required fields
  4. Adding result set size limit

81-94: LGTM! Code simplification improves readability.

Good improvement: Simplifying the promise handling by directly awaiting enqueueMessage makes the code more readable and maintainable.


97-103: LGTM! Good batch handling implementation.

Excellent implementation of batch handling:

  1. Checking for additional results beyond maxCount
  2. Using environment-configured stagger delay for next batch
apps/webapp/app/env.server.ts (1)

445-446: LGTM! Well-configured environment variables.

Good implementation:

  1. Appropriate default values (100 for batch size, 1000ms for stagger)
  2. Correct type coercion to integers
  3. Clear, descriptive naming
✨ 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 6017c52 into main Feb 11, 2025
11 checks passed
@matt-aitken matt-aitken deleted the waiting-for-deploy-batching branch February 11, 2025 19:06
samejr added a commit that referenced this pull request Feb 13, 2025
* Uses image cards for the frameworks

* Removes old snippets

* New AI agents side menu section

* WIP adding new ai agent pages

* Better overview page

* More copy added to the agent example pages

* Copy improvements

* Removes “Creating a project” page and side menu section

* Fixes broken links

* Updates to the latest Mintlify version, fixes issues, changes theme

* Adds descriptions to the main dropdown menu items

* Reformatted Introduction docs ‘landing page’

* Retry heartbeat timeouts by putting back in the queue (#1689)

* If there’s a heartbeat error and no attempts we put it back in the queue to try again

* When nacking, return whether it was put back in the queue or not

* Try and nack, if it fails then fail the run

* Consolidated switch statement

* Fail executing/retrying runs

* OOM retrying on larger machines (#1691)

* OOM retrying on larger machines

* Create forty-windows-shop.md

* Update forty-windows-shop.md

* Only retry again if the machine is different from the original

* Kubernetes OOMs appear as non-zero sigkills, adding support for treating these as OOMs

* Complete the original attempt span if retrying due to an OOM

* Revert "Complete the original attempt span if retrying due to an OOM"

This reverts commit 5f652c6.

* chore: Update version for release (#1666)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Release 3.3.14

* Set machine when triggering docs

* Batch queue runs that are waiting for deploy (#1693)

* Detect ffmpeg OOM errors, added manual OutOfMemoryError (#1694)

* Detect ffmpeg OOM errors, added manual OutOfMemoryError

* Create eighty-spies-knock.md

* Improved the machines docs, including the new OutOfMemoryError

* chore: Update version for release (#1695)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Release 3.3.15

* Create new partitioned TaskEvent table, and switch to it gradually as new runs are created (#1696)

* Create new partitioned TaskEvent table, and switch to it gradually as new runs are created

* Add env var for partition window in seconds

* Make startCreatedAt required in task event store

* Don't create an attempt if the run is final, batchTriggerAndWait bad continue fix (#1698)

* WIP fix for ResumeAttemptService selecting the wrong attempt (which has no error or output)

* Don’t create an attempt if the run is already in a final status

* Don’t get all the columns for the query. Improved the logging.

* Added a log to the batch example

* Filter out the undefined values

* Fix missing logs on child runs by using the root task run createdAt if it exists (#1697)

* Provider changes to support image cache (#1700)

* add env var for additional pull secrets

* make static images configurable

* optional image prefixes

* optional labels with sample rates

* add missing core paths

* remove excessive logs

* Fix run container exits after OOM retries (#1701)

* remove unused imports

* tell run to exit before force requeue

* handle exit for case where we already retried after oom

* improve retry span and add machine props

* don't try to exit run in dev

* Upgrade local dev to use electric beta.15 (#1699)

* Text fixes

* Removed pnpm files

---------

Co-authored-by: Matt Aitken <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Eric Allam <[email protected]>
Co-authored-by: nicktrn <[email protected]>
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