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

driver: convert ErrQueryInterrupted to actual error types (#50517) #50979

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #50517

What problem does this PR solve?

Issue Number: ref #49643

Problem Summary:

When a kill signal is sent to client, and client interrupts. The error returned is a ErrQueryInterrupted. TiDB needs to convert it into concrete types.

What changed and how does it work?

Check List

Tests

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 ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. 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-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Feb 5, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 5, 2024
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 5, 2024
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Feb 8, 2024

@ekexium
Please resolve the conflicts

@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 19, 2024
@cfzjywxk
Copy link
Contributor

@ekexium
The client-go depedency needs to be updated.

@ekexium
Copy link
Contributor

ekexium commented Feb 19, 2024

/retest

Copy link

codecov bot commented Feb 19, 2024

Codecov Report

❗ No coverage uploaded for pull request base (release-7.5@ff6df47). Click here to learn what that means.
The diff coverage is 25.0000%.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #50979   +/-   ##
================================================
  Coverage               ?   71.9983%           
================================================
  Files                  ?       1404           
  Lines                  ?     407611           
  Branches               ?          0           
================================================
  Hits                   ?     293473           
  Misses                 ?      94416           
  Partials               ?      19722           
Flag Coverage Δ
unit 71.9983% <25.0000%> (?)

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.2922% <0.0000%> (?)

@ekexium
Copy link
Contributor

ekexium commented Feb 19, 2024

@ekexium The client-go depedency needs to be updated.

Already updated.

@wuhuizuo
Copy link
Contributor

/retest
build task is timeouted

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 19, 2024
Copy link

ti-chi-bot bot commented Feb 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Feb 20, 2024
Copy link

ti-chi-bot bot commented Feb 20, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-19 11:26:25.79565327 +0000 UTC m=+270074.543276378: ☑️ agreed by zyguan.
  • 2024-02-20 02:27:24.163794727 +0000 UTC m=+324132.911417838: ☑️ agreed by cfzjywxk.

@ekexium
Copy link
Contributor

ekexium commented Feb 20, 2024

/retest

@ti-chi-bot ti-chi-bot bot merged commit 64bde87 into pingcap:release-7.5 Feb 20, 2024
17 of 18 checks passed
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 ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants