Skip to content

Unsafe Recovery: Fix TiFlash blocks commit idx forwarding in unsafe recovery (#18211)#18793

Merged
ti-chi-bot[bot] merged 4 commits intotikv:release-7.5from
ti-chi-bot:cherry-pick-18211-to-release-7.5
Aug 8, 2025
Merged

Unsafe Recovery: Fix TiFlash blocks commit idx forwarding in unsafe recovery (#18211)#18793
ti-chi-bot[bot] merged 4 commits intotikv:release-7.5from
ti-chi-bot:cherry-pick-18211-to-release-7.5

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #18211

What is changed and how it works?

Issue Number: Close #18197

What's Changed:

Fix TiFlash blocks commit idx forwarding in unsafe recovery

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Release note

Fix TiFlash blocks commit idx forwarding in unsafe recovery

Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Aug 5, 2025
@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 5, 2025
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 8, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hbisheng, LykxSassinator, v01dstar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 8, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 8, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-08-08 06:20:32.104132837 +0000 UTC m=+594742.246894002: ☑️ agreed by v01dstar.
  • 2025-08-08 06:22:27.094376401 +0000 UTC m=+594857.237137576: ☑️ agreed by LykxSassinator.

@ti-chi-bot ti-chi-bot bot merged commit 36c5e41 into tikv:release-7.5 Aug 8, 2025
4 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-18211-to-release-7.5 branch August 8, 2025 06:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants