fix: avoid suppress manual compaction #5399

v0y4g3r · 2025-01-19T14:50:35Z

I hereby agree to the terms of the GreptimeDB CLA.

Refer to a related PR or issue link (optional)

What's changed and what's your intention?

This PR fixes the issue that manually triggered compaction will be ignored when compaction is in progress.

PR Checklist

Please convert it to a draft if some of the following conditions are not met.

I have written the necessary rustdoc comments.
I have added the necessary unit tests and integration tests.
This PR requires documentation updates.
API changes are backward compatible.
Schema or data changes are backward compatible.

coderabbitai · 2025-01-19T14:50:42Z

Important

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.

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

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.

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.

**Refactor Compaction Logic** - Removed `PendingCompaction` struct and integrated its functionality directly into `CompactionStatus` in `compaction.rs`. - Simplified waiter management by consolidating waiter handling logic into `CompactionStatus`. - Updated `CompactionRequest` creation to directly handle waiters without intermediate structures. - Adjusted test cases in `compaction.rs` to align with the new waiter management approach. (cherry picked from commit 87e2d1c)

### Add Support for Manual Compaction Requests - **Compaction Logic Enhancements**: - Updated `CompactionScheduler` in `compaction.rs` to handle manual compaction requests using `Options::StrictWindow`. - Introduced `PendingCompaction` struct to manage pending manual compaction requests. - Added logic to reschedule manual compaction requests once the current compaction task is completed. - **Testing**: - Added `test_manual_compaction_when_compaction_in_progress` to verify the handling of manual compaction requests during ongoing compaction processes. These changes enhance the compaction scheduling mechanism by allowing manual compaction requests to be queued and processed efficiently. (cherry picked from commit bc38ed0)

src/mito2/src/compaction.rs

### Add Error Handling for Manual Compaction Override - **`compaction.rs`**: Enhanced the `set_pending_request` method to handle manual compaction overrides by sending an error to the waiter if a previous request exists. - **`error.rs`**: Introduced a new error variant `ManualCompactionOverride` to represent manual compaction being overridden, and mapped it to the `Cancelled` status code.

src/mito2/src/compaction.rs

**Add Error Handling for Pending Compaction Requests** - Enhanced error handling in `compaction.rs` by adding logic to handle errors for pending compaction requests. - Introduced a mechanism to send errors using `waiter.send` when a pending compaction request fails, ensuring proper error propagation and context with `CompactRegionSnafu`.

fengjiachun

LGTM

src/mito2/src/compaction.rs

**Fix Typo and Simplify Code Logic in `compaction.rs`** - Corrected a typo in the license comment from "langucage" to "language". - Simplified the logic for handling `pending_compaction` in `CompactionStatus` by removing unnecessary pattern matching and directly accessing `waiter`.

* fix/avoid-suppress-manual-compaction: **Refactor Compaction Logic** - Removed `PendingCompaction` struct and integrated its functionality directly into `CompactionStatus` in `compaction.rs`. - Simplified waiter management by consolidating waiter handling logic into `CompactionStatus`. - Updated `CompactionRequest` creation to directly handle waiters without intermediate structures. - Adjusted test cases in `compaction.rs` to align with the new waiter management approach. (cherry picked from commit 87e2d1c) * fix/avoid-suppress-manual-compaction: ### Add Support for Manual Compaction Requests - **Compaction Logic Enhancements**: - Updated `CompactionScheduler` in `compaction.rs` to handle manual compaction requests using `Options::StrictWindow`. - Introduced `PendingCompaction` struct to manage pending manual compaction requests. - Added logic to reschedule manual compaction requests once the current compaction task is completed. - **Testing**: - Added `test_manual_compaction_when_compaction_in_progress` to verify the handling of manual compaction requests during ongoing compaction processes. These changes enhance the compaction scheduling mechanism by allowing manual compaction requests to be queued and processed efficiently. (cherry picked from commit bc38ed0) * chore: fix conflicts * fix/avoid-suppress-manual-compaction: ### Add Error Handling for Manual Compaction Override - **`compaction.rs`**: Enhanced the `set_pending_request` method to handle manual compaction overrides by sending an error to the waiter if a previous request exists. - **`error.rs`**: Introduced a new error variant `ManualCompactionOverride` to represent manual compaction being overridden, and mapped it to the `Cancelled` status code. * fix: format * fix/avoid-suppress-manual-compaction: **Add Error Handling for Pending Compaction Requests** - Enhanced error handling in `compaction.rs` by adding logic to handle errors for pending compaction requests. - Introduced a mechanism to send errors using `waiter.send` when a pending compaction request fails, ensuring proper error propagation and context with `CompactRegionSnafu`. * fix/avoid-suppress-manual-compaction: **Fix Typo and Simplify Code Logic in `compaction.rs`** - Corrected a typo in the license comment from "langucage" to "language". - Simplified the logic for handling `pending_compaction` in `CompactionStatus` by removing unnecessary pattern matching and directly accessing `waiter`. * fix: typo

github-actions bot added the docs-not-required This change does not impact docs. label Jan 19, 2025

v0y4g3r force-pushed the fix/avoid-suppress-manual-compaction branch 2 times, most recently from 9626150 to 3baf81f Compare January 19, 2025 14:54

v0y4g3r added 3 commits January 19, 2025 14:57

chore: fix conflicts

78f71a4

v0y4g3r force-pushed the fix/avoid-suppress-manual-compaction branch from 3baf81f to 78f71a4 Compare January 19, 2025 15:21

v0y4g3r marked this pull request as ready for review January 19, 2025 15:22

v0y4g3r requested review from evenyag and waynexia as code owners January 19, 2025 15:22

evenyag reviewed Jan 20, 2025

View reviewed changes

src/mito2/src/compaction.rs Show resolved Hide resolved

v0y4g3r requested a review from evenyag January 20, 2025 07:22

fix: format

8697b9e

evenyag approved these changes Jan 20, 2025

View reviewed changes

src/mito2/src/compaction.rs Show resolved Hide resolved

fengjiachun approved these changes Jan 21, 2025

View reviewed changes

fengjiachun enabled auto-merge January 21, 2025 03:22

evenyag reviewed Jan 21, 2025

View reviewed changes

src/mito2/src/compaction.rs Outdated Show resolved Hide resolved

v0y4g3r added 2 commits January 22, 2025 03:36

fix: typo

26f1db4

fengjiachun added this pull request to the merge queue Jan 22, 2025

Merged via the queue into GreptimeTeam:main with commit 51a8d0a Jan 22, 2025
37 checks passed

evenyag mentioned this pull request Jan 23, 2025

Release v0.11.3 #5421

Closed

3 tasks

evenyag mentioned this pull request Jan 23, 2025

fix: cherry-pick flow & compaction fixes #5427

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: avoid suppress manual compaction #5399

fix: avoid suppress manual compaction #5399

v0y4g3r commented Jan 19, 2025 •

edited

Loading

coderabbitai bot commented Jan 19, 2025

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

Documentation and Community

fengjiachun left a comment

fix: avoid suppress manual compaction #5399

fix: avoid suppress manual compaction #5399

Conversation

v0y4g3r commented Jan 19, 2025 • edited Loading

Refer to a related PR or issue link (optional)

What's changed and what's your intention?

PR Checklist

coderabbitai bot commented Jan 19, 2025

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

Documentation and Community

fengjiachun left a comment

Choose a reason for hiding this comment

v0y4g3r commented Jan 19, 2025 •

edited

Loading