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 a bug where retrying an export RQ job may break scheduling #8584

Merged
merged 1 commit into from
Oct 22, 2024

Conversation

SpecLad
Copy link
Contributor

@SpecLad SpecLad commented Oct 22, 2024

Motivation and context

_patched_retry tries to schedule a copy of the current job. In particular, it copies the dependencies of the old job using
current_rq_job.dependency_ids.

Unfortunately, dependency_ids does not return IDs of dependency jobs, as one might expect. It actually returns the Redis keys corresponding to those jobs, as bytestrings. The RQ job creation code does not support bytestrings as dependency specifiers, so it unintentionally treats them as sequences, saving the individual bytes (as integers) as the dependency job IDs. But since IDs have to be strings, the scheduler quickly crashes when it tries to use those integer "IDs" to construct Redis keys.

Thankfully, we don't actually need to get the dependency IDs. _patched_retry is only used inside running jobs, and if a job is running, it means that all its dependencies are already completed. Thus, the newly scheduled job doesn't need to have any dependencies at all.

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
  • [ ] I have updated the documentation accordingly
  • [ ] I have added tests to cover my changes
  • [ ] I have linked related issues (see GitHub docs)
  • [ ] I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

Summary by CodeRabbit

  • Bug Fixes

    • Resolved an issue where retrying export jobs disrupted the scheduling of new jobs, ensuring proper job queue integrity.
  • Improvements

    • Enhanced error handling for export jobs, including better logging and retry mechanisms.
    • Updated cache management to check for the existence of cache files before removal.
  • Documentation

    • Improved clarity in logging related to the export process.

`_patched_retry` tries to schedule a copy of the current job. In particular,
it copies the dependencies of the old job using
`current_rq_job.dependency_ids`.

Unfortunately, `dependency_ids` does not return IDs of dependency jobs, as
one might expect. It actually returns the Redis _keys_ corresponding to
those jobs, as bytestrings. The RQ job creation code does not support
bytestrings as dependency specifiers, so it unintentionally treats them as
sequences, saving the individual bytes (as integers) as the dependency job
IDs. But since IDs have to be strings, the scheduler quickly crashes when it
tries to use those integer "IDs" to construct Redis keys.

Thankfully, we don't actually need to get the dependency IDs.
`_patched_retry` is only used inside running jobs, and if a job is running,
it means that all its dependencies are already completed. Thus, the newly
scheduled job doesn't need to have any dependencies at all.
@SpecLad SpecLad marked this pull request as ready for review October 22, 2024 16:17
Copy link
Contributor

coderabbitai bot commented Oct 22, 2024

Walkthrough

This update addresses a bug in the scheduling of export RQ jobs, ensuring that retrying a job does not disrupt the scheduling of new jobs. Key modifications include the removal of the depends_on parameter in job scheduling, enhanced error handling for lock acquisition failures, improved logging for the export process, and updates to the clear_export_cache function to handle non-existent cache files. Additionally, the type hinting for the db_instance parameter has been refined to improve clarity.

Changes

File Path Change Summary
changelog.d/20241022_191618_roman_fix_integer_dependencies.md Documented bug fix for export RQ job scheduling.
cvat/apps/dataset_manager/views.py - Removed depends_on from scheduler.enqueue_in in _patched_retry.
- Enhanced error handling for LockNotAvailableError in export function.
- Improved logging for export process.
- Updated clear_export_cache to check for file existence.
- Updated type hint for db_instance in get_export_cache_ttl.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Scheduler
    participant ExportJob
    participant Cache

    User->>Scheduler: Request export job
    Scheduler->>ExportJob: Enqueue job
    ExportJob->>Cache: Check lock availability
    alt Lock available
        ExportJob->>Cache: Remove cache file
        Cache-->>ExportJob: Cache file removed
        ExportJob-->>Scheduler: Job completed
    else Lock not available
        ExportJob->>ExportJob: Retry job after interval
        ExportJob->>Cache: Check lock availability again
    end
Loading

🐰 "In the garden of code, we hop and play,
Fixing bugs and smoothing the way.
With retries and locks, we dance and twirl,
Exporting joy in a digital whirl!
Cache cleared, logs bright, all's well in sight,
Hooray for the changes, let's leap with delight!" 🌼


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

Copy link

sonarcloud bot commented Oct 22, 2024

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
changelog.d/20241022_191618_roman_fix_integer_dependencies.md (1)

1-5: LGTM with a minor suggestion for clarity.

The changelog entry accurately reflects the bug fix described in the PR objectives and follows good practices for changelog entries. It's concise, informative, and includes the correct pull request link.

To slightly improve clarity, consider adding a brief mention of the root cause or the impact of the bug. For example:

 ### Fixed

 - Fixed a bug where an export RQ job being retried may break scheduling
-  of new jobs
+  of new jobs due to incorrect handling of dependency IDs
   (<https://github.com/cvat-ai/cvat/pull/8584>)

This addition provides a bit more context about the nature of the bug without going into excessive technical detail.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 5045f6a and daf91c5.

📒 Files selected for processing (2)
  • changelog.d/20241022_191618_roman_fix_integer_dependencies.md (1 hunks)
  • cvat/apps/dataset_manager/views.py (0 hunks)
💤 Files with no reviewable changes (1)
  • cvat/apps/dataset_manager/views.py
🧰 Additional context used

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.28%. Comparing base (5045f6a) to head (daf91c5).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #8584      +/-   ##
===========================================
- Coverage    74.29%   74.28%   -0.02%     
===========================================
  Files          403      403              
  Lines        43287    43287              
  Branches      3914     3914              
===========================================
- Hits         32162    32154       -8     
- Misses       11125    11133       +8     
Components Coverage Δ
cvat-ui 78.75% <ø> (-0.05%) ⬇️
cvat-server 70.47% <ø> (ø)

@SpecLad SpecLad merged commit bcd0627 into cvat-ai:develop Oct 22, 2024
42 checks passed
@SpecLad SpecLad deleted the fix-integer-dependencies branch October 22, 2024 17:04
@cvat-bot cvat-bot bot mentioned this pull request Oct 24, 2024
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.

2 participants