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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jun 11, 2024
Merged

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

merged 2 commits into from
Jun 11, 2024

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #11251

What problem does this PR solve?

Issue Number: close #11271

What is changed and how it works?

Log slow conflict detect every 60s.

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 added 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. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Jun 11, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 11, 2024
Merged
@ti-chi-bot ti-chi-bot added cherry-pick-approved Cherry pick PR approved by release team. labels Jun 11, 2024
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hicqu

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:

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 Jun 11, 2024
@hicqu
fix
955a5aa 
Signed-off-by: qupeng <qupeng@pingcap.com>
@ti-chi-bot ti-chi-bot bot merged commit 053cdaf into pingcap:release-6.5 Jun 11, 2024
9 of 10 checks passed
@hicqu hicqu deleted the cherry-pick-11251-to-release-6.5 branch June 11, 2024 07:58
hicqu added a commit to ti-chi-bot/tiflow that referenced this pull request Jun 12, 2024
@hicqu
Squashed commit of the following:
a3d30ca 
commit c092599
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Wed Jun 12 00:26:59 2024 +0800

    pkg/config, sink(ticdc): support output raw change event for mq and cloud storage sink (pingcap#11226) (pingcap#11290)

    close pingcap#11211

commit 3426e46
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Tue Jun 11 19:40:29 2024 +0800

    puller(ticdc): fix wrong update splitting behavior after table scheduling (pingcap#11269) (pingcap#11282)

    close pingcap#11219

commit 2a28078
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Tue Jun 11 16:40:37 2024 +0800

    mysql(ticdc): remove error filter when check isTiDB in backend init (pingcap#11214) (pingcap#11261)

    close pingcap#11213

commit 2425d54
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Tue Jun 11 16:40:30 2024 +0800

    log(ticdc): Add more error query information to the returned error to facilitate users to know the cause of the failure (pingcap#10945) (pingcap#11257)

    close pingcap#11254

commit 053cdaf
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Tue Jun 11 15:34:30 2024 +0800

    cdc: log slow conflict detect every 60s (pingcap#11251) (pingcap#11287)

    close pingcap#11271

commit 327ba7b
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Tue Jun 11 11:42:00 2024 +0800

    redo(ticdc): return internal error in redo writer (pingcap#11011) (pingcap#11091)

    close pingcap#10124

commit d82ae89
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Mon Jun 10 22:28:29 2024 +0800

    ddl_puller (ticdc): handle dorp pk/uk ddl correctly (pingcap#10965) (pingcap#10981)

    close pingcap#10890

commit f15bec9
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Fri Jun 7 16:16:28 2024 +0800

    redo(ticdc): enable pprof and set memory limit for redo applier (pingcap#10904) (pingcap#10996)

    close pingcap#10900

commit ba50a0e
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Wed Jun 5 19:58:26 2024 +0800

    test(ticdc): enable sequence test (pingcap#11023) (pingcap#11037)

    close pingcap#11015

commit 94b9897
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Wed Jun 5 17:08:56 2024 +0800

    mounter(ticdc): timezone fill default value should also consider tz. (pingcap#10932) (pingcap#10946)

    close pingcap#10931

commit a912d33
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Wed Jun 5 10:49:25 2024 +0800

    mysql (ticdc): Improve the performance of the mysql sink by refining the transaction event batching logic (pingcap#10466) (pingcap#11242)

    close pingcap#11241

commit 6277d9a
Author: dongmen <20351731+asddongmen@users.noreply.github.com>
Date:   Wed May 29 20:13:22 2024 +0800

    kvClient (ticdc): revert e5999e3 to remove useless metrics (pingcap#11184)

    close pingcap#11073

commit 54e93ed
Author: dongmen <20351731+asddongmen@users.noreply.github.com>
Date:   Wed May 29 17:43:22 2024 +0800

    syncpoint (ticdc): make syncpoint support base64 encoded password (pingcap#11162)

    close pingcap#10516

commit 0ba9329
Author: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Date:   Wed May 29 09:07:21 2024 +0800

    (redo)ticdc: fix the event orderliness in redo log (pingcap#11117) (pingcap#11180)

    close pingcap#11096

Signed-off-by: qupeng <qupeng@pingcap.com>
hicqu added a commit to hicqu/ticdc that referenced this pull request Jun 13, 2024
@hicqu
Revert "cdc: log slow conflict detect every 60s (pingcap#11251) (ping…
ebe936e 
…cap#11287)"

This reverts commit 053cdaf.
hicqu pushed a commit to hicqu/ticdc that referenced this pull request Jun 13, 2024
@ti-chi-bot @hicqu
cdc: log slow conflict detect every 60s (pingcap#11251) (pingcap#11287)
0909617 
close pingcap#11271

Signed-off-by: qupeng <qupeng@pingcap.com>
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jun 18, 2024
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 18, 2024

This cherry pick PR is for a release branch and has not yet been approved by triage owners.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.

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.

hicqu added a commit to hicqu/ticdc that referenced this pull request Jun 18, 2024
@hicqu
Revert "cdc: log slow conflict detect every 60s (pingcap#11251) (ping…
696879c 
…cap#11287)"

This reverts commit 053cdaf.
@hicqu hicqu mentioned this pull request Jun 18, 2024
Merged
ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@hicqu
Revert "cdc: log slow conflict detect every 60s (#11251) (#11287)" (#…
1ecce1d 
…11324)

close #11323
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hicqu hicqu hicqu approved these changes

Assignees

@hicqu hicqu

Labels
approved do-not-merge/cherry-pick-not-approved 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. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ti-chi-bot @hicqu