Skip to content

Conversation

MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Jul 18, 2024

This is a reopened PR of #54574 which cherry-picks #53698

What problem does this PR solve?

Issue Number: close #53540 #54375

Problem Summary:

What changed and how does it work?

Update client-go to fix the problem that when query OOM kill happens in a transaction, the next query in the transaction may encounter panic when starting fair locking.

Also includes tikv/client-go#1381 (ref: #54375)

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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 problem that when query OOM kill happens in a transaction, the next query in the transaction may encounter panic when trying to start fair locking

@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 18, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 18, 2024
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/cherry-pick-not-approved labels Jul 18, 2024
Copy link

tiprow bot commented Jul 18, 2024

Hi @MyonKeminta. 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.

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-sigs/prow repository.

Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 18, 2024
@MyonKeminta
Copy link
Contributor Author

/retest

Copy link

tiprow bot commented Jul 18, 2024

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

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-sigs/prow repository.

Copy link

codecov bot commented Jul 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-7.5@b8bfc5f). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #54740   +/-   ##
================================================
  Coverage               ?   72.0536%           
================================================
  Files                  ?       1412           
  Lines                  ?     411835           
  Branches               ?          0           
================================================
  Hits                   ?     296742           
  Misses                 ?      95228           
  Partials               ?      19865           
Flag Coverage Δ
unit 72.0536% <ø> (?)

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

Components Coverage Δ
dumpling 53.9913% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.4656% <0.0000%> (?)

Copy link

ti-chi-bot bot commented Jul 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

ti-chi-bot bot commented Jul 19, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-07-18 08:39:44.121397221 +0000 UTC m=+516006.112338687: ☑️ agreed by cfzjywxk.
  • 2024-07-19 04:39:05.016576114 +0000 UTC m=+587967.007517585: ☑️ agreed by you06.

@ti-chi-bot ti-chi-bot bot merged commit ca1259c into pingcap:release-7.5 Jul 19, 2024
@MyonKeminta MyonKeminta deleted the m/cherry-pick-53698-to-7.5 branch July 19, 2024 07:02
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants