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

txn: Update client-go to fix the issue that GC BatchResolveLcok may miss primary pessimistic locks (#45143) #45152

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #45143

What problem does this PR solve?

Issue Number: close #45134

Problem Summary:

What is changed and how it works?

This PR update client-go dependency to include tikv/client-go#866 to fix the issue that BatchResolveLock may leave some primary pessimistic lock uncleared in some rare cases.

The issue is introduced while fixing #43243 . For branches that no release with #43243's fix was published, the release note is not needed.

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.

Fix the issue that in some rare cases, some primary pessimistic locks may be left uncleared after GC.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Jul 4, 2023
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 4, 2023
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 4, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jul 4, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jul 15, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
@ti-chi-bot ti-chi-bot bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/cherry-pick-not-approved labels Jul 24, 2023
@MyonKeminta MyonKeminta force-pushed the cherry-pick-45143-to-release-6.5 branch from ea0c4d3 to 116a0bc Compare August 8, 2023 08:39
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 8, 2023
Signed-off-by: MyonKeminta <[email protected]>
@MyonKeminta MyonKeminta force-pushed the cherry-pick-45143-to-release-6.5 branch from 8030ef3 to 47152d4 Compare August 8, 2023 09:14
@codecov
Copy link

codecov bot commented Aug 8, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@74abc22). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #45152   +/-   ##
================================================
  Coverage               ?   73.7731%           
================================================
  Files                  ?       1083           
  Lines                  ?     347693           
  Branches               ?          0           
================================================
  Hits                   ?     256504           
  Misses                 ?      74784           
  Partials               ?      16405           

@MyonKeminta MyonKeminta requested review from cfzjywxk and ekexium August 8, 2023 10:06
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Aug 8, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, ekexium

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 lgtm label Aug 8, 2023
@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 8, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 8, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-08 10:10:34.45099027 +0000 UTC m=+20999.000006249: ☑️ agreed by ekexium.
  • 2023-08-08 12:12:15.769386924 +0000 UTC m=+28300.318402910: ☑️ agreed by cfzjywxk.

@ti-chi-bot ti-chi-bot bot merged commit e566f59 into pingcap:release-6.5 Aug 8, 2023
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 Denotes a PR that will be considered when it comes time to generate release notes. 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
Development

Successfully merging this pull request may close these issues.

4 participants