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): reset to the latest committed epoch in recovery #14923

Merged
merged 10 commits into from
Feb 19, 2024

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented Feb 1, 2024

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

What's changed and what's your intention?

Previously in storage clear_shared_buffer, we only reset the storage the local max committed epoch. However, it is possible that during recovery the global committed epoch has a greater max committed epoch, and in recovery we have to make an extra wait_epoch_committed rpc to wait for the new version update.

In this PR, we change to wait for the local max committed epoch to bump up to the global max committed epoch in the clear_shared_buffer so that we don't have to send the extra wait_epoch_committed. When we handle the clear event, the cache refiller will drain its pending version update immediately and apply to the current version to try to bump up the local committed epoch to the global one. If the local committed epoch has not reach the global one after the pending version update have been applied, it will keep waiting for further notification of version update and applying the version update until the local committed epoch reach the global one.

Major changes in this PR:

  • pass prev_epoch in the force_stop_actors rpc and pass it all the way down to where we actually handle the storage clear in event handler.
  • add prev_epoch parameter in the clear_shared_buffer, and change its return type from StorageResult<()> to ()
  • use a separate channel to get notified on version update, where we previously reuse the channel for hummock event
  • when handling clear event, we will drain the cache refiller and apply its pending version update if there is any. If the committed epoch is still below the global one, keep waiting for further version update notification until reaching the global one.

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.

@hzxa21
Copy link
Collaborator

hzxa21 commented Feb 1, 2024

Any context on why we need this?

Copy link

gitguardian bot commented Feb 1, 2024

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secret in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
9425213 Triggered Generic Password afc7c19 ci/scripts/regress-test.sh View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@wenym1
Copy link
Contributor Author

wenym1 commented Feb 1, 2024

Any context on why we need this?

I just updated the PR description. In short, with this PR we can have two benefits.

  1. in recovery we can save an extra rpc to wait for the local mce to bump up to global one.
  2. avoid waiting for cache refill finish during recovery.

@wenym1 wenym1 requested review from hzxa21, Li0k and MrCroxx February 1, 2024 10:51
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.

@MrCroxx PTAL for cache refiller changes.

self.reset_compute_nodes(&info).await.inspect_err(|err| {
warn!(error = %err.as_report(), "reset compute nodes failed");
})?;
self.reset_compute_nodes(&info, prev_epoch.value().0)
Copy link
Collaborator

Choose a reason for hiding this comment

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

In order for this PR to work, we need to ensure that prev_epoch == latest MCE. Currently this is guaranteed because the prev_epoch is get from self.context.hummock_manager.latest_snapshot().committed_epoch before calling fn recovery.

How about making it more explicitly by getting self.hummock_manager.latest_snapshot().committed_epoch inside the implementation of fn recovery?

@wenym1 wenym1 added this pull request to the merge queue Feb 19, 2024
Merged via the queue into main with commit b2bda85 Feb 19, 2024
27 of 29 checks passed
@wenym1 wenym1 deleted the yiming/wait-epoch-in-recovery branch February 19, 2024 07:18
TennyZhuang added a commit that referenced this pull request Feb 20, 2024
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.

3 participants