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 an issue with deleting frames #8872

Merged
merged 7 commits into from
Dec 29, 2024
Merged

Conversation

klakhov
Copy link
Contributor

@klakhov klakhov commented Dec 25, 2024

Motivation and context

Previously, in the Honeypots patch, we introduced periodic metadata updates to allow the UI to reflect chunk changes dynamically. However, this introduced a couple of issues:

  1. The object received from the server was incorrectly utilized by the UI, preventing frame deletion after requesting updated metadata.
  2. The new object overwritten unsaved deleted frame data, leading to the loss of user data.

Steps to Reproduce the Frame Deletion Issue

  1. Set jobMetaDataReloadPeriod in config.ts of cvat-core to a small interval, such as 15 seconds (the default is 1 hour).
  2. Open a job and ensure the /data/meta request is sent.
  3. Wait for the jobMetaDataReloadPeriod to elapse.
  4. Change the frame and confirm that a new /data/meta request is sent.
  5. Attempt to delete any frame and observe that it is not deleted.
    deleting-frame

Resolution

To fix this, I removed the secondary storage of jobMeta in frameDataCache. Now, it uses an asynchronous getter that fetches data directly from frameMetaCache. Having two caches for the same data caused synchronization issues, which led to this bug.

To fix second issue I added merge logic inside getFramesMeta function that will update new object with unsaved data.

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

  • New Features

    • Introduced a new enum to standardize the representation of deleted frame states.
    • Enhanced metadata retrieval efficiency with updated caching logic.
  • Bug Fixes

    • Improved clarity and maintainability in handling the deletion status of frames.
  • Refactor

    • Simplified logic for marking frames as deleted or restored using the new enum.

@klakhov klakhov added the ui/ux label Dec 25, 2024
@klakhov klakhov requested a review from bsekachev as a code owner December 25, 2024 07:47
Copy link
Contributor

coderabbitai bot commented Dec 25, 2024

Important

Review skipped

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

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Walkthrough

The changes in the frames.ts file focus on improving frame metadata handling, particularly for deleted frames. A new DeletedFrameState enum is introduced to standardize frame deletion states, replacing string literals. The frameMetaCache type is expanded to support more flexible caching, allowing both FramesMetaData and Promise<FramesMetaData>. The modifications enhance code readability and maintainability by providing a more structured approach to managing frame metadata and deletion states.

Changes

File Change Summary
cvat-core/src/frames.ts - Updated frameMetaCache type to support multiple metadata types
- Added DeletedFrameState enum for standardizing frame deletion states
- Refactored frame metadata handling logic
- Modified getFramesMeta function to improve metadata retrieval efficiency

Poem

🐰 Frames dancing, metadata bright
Enum brings order, deletion's new might
Promises cached with elegant grace
Code flows smoother in this coding space
Rabbit's refactor, clean and so light! 🔧


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.

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

🧹 Nitpick comments (2)
cvat-core/src/frames.ts (2)

570-572: Restore previous cache carefully.

Restoring from previousCache is a neat fallback mechanism if new metadata loading fails. Consider logging or handling partial updates for better debugging, especially if a half-updated cache can cause inconsistent data.


631-631: Improve clarity on destructured meta.

const { meta: prevMeta } = cached; is good, but consider a more direct naming (e.g., oldMeta) for clarity and consistency.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between d966c1e and acbed9d.

📒 Files selected for processing (1)
  • cvat-core/src/frames.ts (6 hunks)
🔇 Additional comments (8)
cvat-core/src/frames.ts (8)

42-43: Consider adopting consistent resolved/promise states.

The union approach (holding either a FramesMetaData or a Promise<FramesMetaData>) helps lazy-load metadata. However, be mindful of potential edge cases if code assumes a resolved state prematurely. Continue ensuring all consumers handle both states safely.


44-47: Enum-based approach improves readability.

Using DeletedFrameState clarifies frame deletion statuses and avoids "magic strings." This design is more resilient and discoverable.


90-96: Validate opposite state reset workflow.

The logic for toggling between DELETED and RESTORED is solid. Nonetheless, ensure that simultaneous toggles (e.g., concurrent modifications) do not cause race conditions. If concurrency is a concern, consider adding suitable synchronization or queueing.


566-566: Cache assignment could introduce race conditions.

Reassigning frameMetaCache[id] after loading new metadata is acceptable, but be cautious of concurrent requests that might overwrite or revert the cache unexpectedly.


578-580: Immediate promise resolution ensures efficiency.

Returning a pre-resolved promise when the cache is already available is an efficient short-circuit. This prevents unnecessary server calls and reduces latency.


Line range hint 633-646: Ensure chunk redefinition handles unsaved data.

When meta.chunksUpdatedDate changes, clearing old data is correct. However, double-check for any unsaved or ephemeral data that could be lost in the process.


647-658: Merging updated fields with new metadata is robust.

Applying the local changes from prevMeta to meta ensures user actions aren't lost. This approach is well-organized. Nonetheless, consider adding logs or metrics if frequent merges lead to confusion or performance concerns.


810-816: Throwing an error on uninitialized or still-pending metadata is prudent.

The explicit error message helps debugging. Consider clarifying next steps in a user-facing message if this error can bubble up to the UI.

@codecov-commenter
Copy link

codecov-commenter commented Dec 25, 2024

Codecov Report

Attention: Patch coverage is 76.78571% with 13 lines in your changes missing coverage. Please review.

Project coverage is 73.90%. Comparing base (185a00b) to head (fba7408).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #8872      +/-   ##
===========================================
- Coverage    73.90%   73.90%   -0.01%     
===========================================
  Files          408      408              
  Lines        44131    44163      +32     
  Branches      3986     3993       +7     
===========================================
+ Hits         32615    32637      +22     
- Misses       11516    11526      +10     
Components Coverage Δ
cvat-ui 78.40% <76.78%> (-0.02%) ⬇️
cvat-server 70.06% <ø> (ø)

@klakhov klakhov requested review from zhiltsov-max and removed request for bsekachev December 26, 2024 10:00
@zhiltsov-max zhiltsov-max merged commit 26f08ce into develop Dec 29, 2024
35 checks passed
@zhiltsov-max zhiltsov-max deleted the kl/fix-delete-frame-issue branch December 29, 2024 11:55
@cvat-bot cvat-bot bot mentioned this pull request Jan 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants