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: openSession instead set nil when changeUser #33894

Merged
merged 3 commits into from
Apr 14, 2022

Conversation

knull-cn
Copy link
Contributor

@knull-cn knull-cn commented Apr 12, 2022

What problem does this PR solve?

Issue Number:
close #33892

Problem Summary:

What is changed and how it works?

Check List

Tests

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

Release note

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • wjhuang2016

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 12, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 12, 2022

Copy link
Member

@bb7133 bb7133 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 added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 14, 2022
server/conn.go Outdated
@@ -2341,7 +2341,11 @@ func (cc *clientConn) handleChangeUser(ctx context.Context, data []byte) error {
if err := cc.ctx.Close(); err != nil {
logutil.Logger(ctx).Debug("close old context failed", zap.Error(err))
}
cc.ctx = nil
// new openSession here, openSessionAndDoAuth will not run again because ctx was not nil.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// new openSession here, openSessionAndDoAuth will not run again because ctx was not nil.
// openSession explicitly to renew session, it won't run again in openSessionAndDoAuth because ctx is not nil.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 14, 2022
@wjhuang2016
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 77601b2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2022
@ti-chi-bot ti-chi-bot merged commit 1046137 into pingcap:master Apr 14, 2022
@tiancaiamao tiancaiamao added the needs-cherry-pick-release-5.4 Type: Need cherry pick to release-5.4 label May 6, 2022
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #34427

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request May 6, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@XuHuaiyu XuHuaiyu added the needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 label Jun 15, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 15, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #35405

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Type: Need cherry pick to release-5.4 release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

server: set ctx for ComChangeUser maybe trigger panic at ShowProcessList
8 participants