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.

Sign up for GitHub

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

Jump to bottom

server: fix tls setup and error log (#15287) #15292

Merged
merged 3 commits into from
Mar 12, 2020
Merged

server: fix tls setup and error log (#15287) #15292

merged 3 commits into from
Mar 12, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Mar 11, 2020

cherry-pick #15287 to release-3.0

What problem does this PR solve?

  • fix wrong output for mysql-protocol tls enable log
  • lack of tls enable log for status server
  • handshake error maybe swallowed by audit plugin

What is changed and how it works?

refine mysql-protocol and status server log.

[2020/03/11 16:34:44.080 +08:00] [INFO] [server.go:223] ["mysql protocol server secure connection is enabled"] ["client verification enabled"=true]
[2020/03/11 16:34:44.083 +08:00] [INFO] [http_status.go:299] ["HTTP/GRPC status server secure connection is enabled"] ["CN verification enabled"=true]

log handshake error before audit plugin

Check List

Tests

  • Unit test
  • Integration test
  • Manual test : use tls start and watch log

Code changes

  • log change

Side effects

  • n/a

Related changes

  • Need to cherry-pick to the release branch 3.1 and 3.0

Release note

  • n/a

This change is Reviewable

@lysu @sre-bot
cherry pick pingcap#15287 to release-3.0
71861ff 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 11, 2020

/run-all-tests

@sre-bot sre-bot mentioned this pull request Mar 11, 2020
Merged
@lysu
Copy link
Contributor

lysu commented Mar 11, 2020

/run-all-tests

imtbkcat
imtbkcat reviewed Mar 11, 2020
View reviewed changes
Copy link

@imtbkcat imtbkcat left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp
Copy link
Member

jackysp commented Mar 12, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 12, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 12, 2020

/run-all-tests

jackysp
jackysp approved these changes Mar 12, 2020
View reviewed changes
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp
Copy link
Member

jackysp commented Mar 12, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 12, 2020

/run-all-tests

@sre-bot sre-bot merged commit 051a873 into pingcap:release-3.0 Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imtbkcat imtbkcat imtbkcat left review comments

@jackysp jackysp jackysp approved these changes

Assignees
No one assigned
Labels
component/config security Everything related with security status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sre-bot @lysu @jackysp @imtbkcat