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

Revert "cdc: log slow conflict detect every 60s (#11251) (#11287)" #11324

Merged
merged 1 commit into from
Jun 18, 2024

Conversation

hicqu
Copy link
Contributor

@hicqu hicqu commented Jun 18, 2024

This reverts commit 053cdaf.

What problem does this PR solve?

Issue Number: close #11323

What is changed and how it works?

Revert #11287.

When applying events from Redo logs, events are not attached with TableID. Now we can revert this PR to avoid the problem.

Check List

Tests

  • No code

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 18, 2024
Copy link
Contributor

ti-chi-bot bot commented Jun 18, 2024

@hongyunyan: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 18, 2024
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 18, 2024
Copy link
Contributor

ti-chi-bot bot commented Jun 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [3AceShowHand,asddongmen]

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 and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jun 18, 2024
Copy link
Contributor

ti-chi-bot bot commented Jun 18, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-06-18 09:15:35.983432902 +0000 UTC m=+106262.468921733: ☑️ agreed by asddongmen.
  • 2024-06-18 10:18:24.508740559 +0000 UTC m=+110030.994229390: ☑️ agreed by 3AceShowHand.

@ti-chi-bot ti-chi-bot bot merged commit 1ecce1d into pingcap:release-6.5 Jun 18, 2024
10 checks passed
@hicqu hicqu deleted the revert-11323 branch June 18, 2024 10: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. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants