Skip to content

br: fix the issue that state not set correctly after resolve locks#46903

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
3pointer:decouple_pitr
Sep 12, 2023
Merged

br: fix the issue that state not set correctly after resolve locks#46903
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
3pointer:decouple_pitr

Conversation

@3pointer
Copy link
Contributor

@3pointer 3pointer commented Sep 12, 2023

What problem does this PR solve?

Issue Number: ref #40759

Problem Summary:
After PR #45904 merged. advancer resolve lock state set is too frequently. This PR try to correct it.

What is changed and how it works?

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

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link

ti-chi-bot bot commented Sep 12, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 12, 2023
@tiprow
Copy link

tiprow bot commented Sep 12, 2023

Hi @3pointer. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Details

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.

@3pointer 3pointer marked this pull request as ready for review September 12, 2023 08:55
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 12, 2023
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Sep 12, 2023
@codecov
Copy link

codecov bot commented Sep 12, 2023 •
edited
Loading

Codecov Report

Merging #46903 (f5197e6) into master (25fd1b7) will decrease coverage by 0.6500%.
Report is 5 commits behind head on master.
The diff coverage is 57.1428%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #46903        +/-   ##
================================================
- Coverage   73.3592%   72.7092%   -0.6500%     
================================================
  Files          1328       1350        +22     
  Lines        397004     404372      +7368     
================================================
+ Hits         291239     294016      +2777     
- Misses        87174      91753      +4579     
- Partials      18591      18603        +12
Flag Coverage Δ
integration 27.7927% <0.0000%> (?)
unit 73.3188% <57.1428%> (-0.0404%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 54.0444% <ø> (ø)
parser 85.0019% <ø> (ø)
br 48.7567% <57.1428%> (-4.1508%) ⬇️

@ti-chi-bot
Copy link

ti-chi-bot bot commented Sep 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Leavrth, YuJuncen

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 and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 12, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Sep 12, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-09-12 09:04:49.760207804 +0000 UTC m=+346471.684764200: ☑️ agreed by Leavrth.
  • 2023-09-12 09:35:46.728674772 +0000 UTC m=+348328.653231189: ☑️ agreed by YuJuncen.

@3pointer
Copy link
Contributor Author

3pointer commented Sep 12, 2023

/retest

@tiprow
Copy link

tiprow bot commented Sep 12, 2023

@3pointer: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

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 bot merged commit 9f8a412 into pingcap:master Sep 12, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 12, 2023
Closed
12 tasks
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 12, 2023

In response to a cherrypick label: new pull request created to branch release-6.5: #46915.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Sep 12, 2023
@3pointer @ti-chi-bot
This is an automated cherry-pick of pingcap#46903
6fe7c81 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 12, 2023

In response to a cherrypick label: new pull request created to branch release-7.1: #46916.

@ti-chi-bot ti-chi-bot mentioned this pull request Sep 12, 2023
Closed
12 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Sep 12, 2023
@3pointer @ti-chi-bot
This is an automated cherry-pick of pingcap#46903
ef7b941 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
3pointer added a commit to ti-chi-bot/tidb that referenced this pull request Sep 12, 2023
@3pointer
br: fix the issue that state not set correctly after resolve locks (p…
8fd8cce 
…ingcap#46903)

ref pingcap#40759
3pointer added a commit to ti-chi-bot/tidb that referenced this pull request Oct 7, 2023
@3pointer
This is an automated cherry-pick of pingcap#46903
3fa1d6d 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Conflicts:
	br/pkg/streamhelper/advancer.go
	br/pkg/streamhelper/advancer_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@Leavrth Leavrth Leavrth approved these changes

Assignees

No one assigned

Labels

approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@3pointer @ti-chi-bot @YuJuncen @Leavrth