Skip to content

cdc: remove assertion on the lock start-ts (#19084)#19096

Merged
ti-chi-bot[bot] merged 2 commits intotikv:release-8.5from
ti-chi-bot:cherry-pick-19084-to-release-8.5
Nov 10, 2025
Merged

cdc: remove assertion on the lock start-ts (#19084)#19096
ti-chi-bot[bot] merged 2 commits intotikv:release-8.5from
ti-chi-bot:cherry-pick-19084-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #19084

What is changed and how it works?

Issue Number: Close #19083

What's Changed:

* revert #16864 to avoid the TiKV-CDC panic due to assertion failed
  • The generation field is removed by revert the PR, need to do more work about how to support pipelined DML.
  • When push_lock, just push it like before, and print logs if there is already the lock with the same key.

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

revert #16864 to avoid the TiKV-CDC panic due to assertion failed

close tikv#19083

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Nov 7, 2025
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 7, 2025
Signed-off-by: 3AceShowHand <jinl1037@hotmail.com>
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. do-not-merge/cherry-pick-not-approved labels Nov 7, 2025
@3AceShowHand
Copy link
Contributor

/test pull-unit-test

@3AceShowHand
Copy link
Contributor

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 10, 2025
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 10, 2025
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 10, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3AceShowHand, cfzjywxk

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 the approved label Nov 10, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 10, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-11-10 03:13:47.791454987 +0000 UTC m=+671877.234484856: ☑️ agreed by 3AceShowHand.
  • 2025-11-10 03:17:56.747396979 +0000 UTC m=+672126.190426859: ☑️ agreed by cfzjywxk.

@ti-chi-bot ti-chi-bot bot merged commit ec12fbc into tikv:release-8.5 Nov 10, 2025
5 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-19084-to-release-8.5 branch November 10, 2025 03:20
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants