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(storage): fix compactor sst switch condition #13790

Merged
merged 6 commits into from
Dec 4, 2023
Merged

Conversation

Li0k
Copy link
Contributor

@Li0k Li0k commented Dec 4, 2023

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

  1. fix sst switch condition
    2. refine compactor config
  2. add log

related to #13773

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@github-actions github-actions bot added the type/fix Bug fix label Dec 4, 2023
/// The spill threshold for mem table.
#[serde(default = "default::storage::mem_table_spill_threshold")]
pub mem_table_spill_threshold: usize,

#[serde(default)]
pub object_store: ObjectStoreConfig,

#[serde(default)]
pub compactor: CompactorConfig,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This seems to be a breaking change. For example, if user defines the config previously via:

[storage]
compactor_max_task_multiplier=4

This config will become invalid and user needs to change it toml to:

[storage.compactor]
compactor_max_task_multiplier=4

Copy link
Contributor Author

Choose a reason for hiding this comment

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

revert it

@Li0k Li0k enabled auto-merge December 4, 2023 11:57
Copy link

codecov bot commented Dec 4, 2023

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (2461651) 68.23% compared to head (1a6207e) 68.23%.

Files Patch % Lines
.../storage/src/hummock/compactor/compactor_runner.rs 25.00% 3 Missing ⚠️
src/meta/src/hummock/manager/mod.rs 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main   #13790   +/-   ##
=======================================
  Coverage   68.23%   68.23%           
=======================================
  Files        1524     1524           
  Lines      262203   262210    +7     
=======================================
+ Hits       178904   178911    +7     
  Misses      83299    83299           
Flag Coverage Δ
rust 68.23% <75.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Li0k Li0k added this pull request to the merge queue Dec 4, 2023
Merged via the queue into main with commit 4a51bd7 Dec 4, 2023
28 of 29 checks passed
@Li0k Li0k deleted the li0k/debug_align_2 branch December 4, 2023 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/fix Bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants