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

feat(storage): avoid uploader depending on seal_epoch #16985

Merged
merged 3 commits into from
Jun 12, 2024

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented May 29, 2024

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

What's changed and what's your intention?

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.

@wenym1 wenym1 marked this pull request as draft May 29, 2024 03:03
@wenym1 wenym1 marked this pull request as ready for review May 30, 2024 09:49
src/storage/src/hummock/event_handler/uploader.rs Outdated Show resolved Hide resolved
src/storage/src/hummock/event_handler/uploader.rs Outdated Show resolved Hide resolved
Comment on lines 995 to 1002
/// Poll the success of the oldest spilled task of unsealed data. Return `Poll::Ready(None)` if
/// there is no spilling task.
fn poll_unsealed_spill_task(
&mut self,
cx: &mut Context<'_>,
) -> Poll<Option<StagingSstableInfo>> {
// iterator from older epoch to new epoch so that the spill task are finished in epoch order
for unsealed_data in self.unsealed_data.values_mut() {
for unsealed_data in self.unsync_data.epoch_data.values_mut() {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think the term unseal/sealed/sync are used with different meanings in different parts of the codes after this PR. For example, sealed data in LocalInstanceUnsyncData is considered unsealed in the context of HummockUploader. Can we make it less confusing by having a clear definition of sync and sealed? Some ideas:

  • unsealed: per instance concept. Data is unsealed before local_seal_epoch
  • sealed: per instance concept. Data is sealed after local_seal_epoch
  • spill: per epoch concept. Data is spilled if may_spill triggers.
  • sync: per epoch conecpt. Data is synced after sync.

unsealed, sealed and spill data are all considered unsync.

Following this ideas, we can:

  1. rename poll_unsealed_spill_task to poll_unsync_spill_task
  2. remove SealedData struct and return the corresponding epoch_data on unsync_data.sync

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed. I have removed the concept of sealed and unsealed in global uploader. The concept is only in LocalInstanceUnsyncData.

@wenym1 wenym1 changed the base branch from main to yiming/new-sync-finish-event June 5, 2024 03:06
Base automatically changed from yiming/new-sync-finish-event to main June 6, 2024 06:15
@wenym1 wenym1 requested review from hzxa21, Li0k and MrCroxx June 11, 2024 03:53
@wenym1 wenym1 force-pushed the yiming/deprecate-global-seal-epoch branch from be45d98 to f5e3455 Compare June 12, 2024 05:46
Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

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

Rest LGTM

@wenym1 wenym1 added this pull request to the merge queue Jun 12, 2024
Merged via the queue into main with commit d488f65 Jun 12, 2024
28 of 29 checks passed
@wenym1 wenym1 deleted the yiming/deprecate-global-seal-epoch branch June 12, 2024 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants