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

server,session: make sure ResultSet.Close() errors return to the client (#48447) #48484

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Nov 9, 2023

This is an automated cherry-pick of #48447

What problem does this PR solve?

Issue Number: close #48446

Problem Summary:

What is changed and how it works?

This also fix #48411 in another way, and can prevent more bugs.

Close the result set after all rs.Next(), and before cc.writeEOF()
Avoid the case that error happen and can't be sent to the client after writeEOF.

Check List

Tests

The test code in #48412 should also apply for this one, as the both can fix #48411, so I don't bother writer another duplicated test.

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

See #48411

  • 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.

None

@ti-chi-bot ti-chi-bot added 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. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Nov 9, 2023
Copy link

ti-chi-bot bot commented Nov 9, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign mmyj for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

Copy link

codecov bot commented Nov 9, 2023

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #48484   +/-   ##
================================================
  Coverage               ?   73.6893%           
================================================
  Files                  ?       1085           
  Lines                  ?     348859           
  Branches               ?          0           
================================================
  Hits                   ?     257072           
  Misses                 ?      75306           
  Partials               ?      16481           

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 21, 2023
@tiancaiamao
Copy link
Contributor

tiancaiamao commented Nov 24, 2023

There are some unknow performance regression on this PR, hold on the cherry-pick process.

@crazycs520
Copy link
Contributor

Temporarily close for v6.5.6 release.

@crazycs520 crazycs520 closed this Nov 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. 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. 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.

3 participants