Support proxy protocol v2 in MySQL #12424
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
database-access
capnspacehook
approved these changes
May 4, 2022
capnspacehook
approved these changes
May 4, 2022
codingllama
reviewed
May 4, 2022
zmb3
reviewed
May 4, 2022
lib/srv/db/proxy_test.go
Outdated
| require.NoError(t, err) | ||
| require.NoError(t, psql.Close(ctx)) | ||
| for _, v2 := range []bool{false, true} { | ||
| v2 := v2 |
There was a problem hiding this comment.
it is now (we pass it down to closure to NewTestProxy, I had hardcoded false before)
There was a problem hiding this comment.
But there's no parallel code here, so I think v2 will be correct on each iteration of the loop.
There was a problem hiding this comment.
I've added it as a safeguard in case we add something like t.Parallel somewhere down the road. Currently it's true it's not needed. I removed it for now.
zmb3
approved these changes
May 6, 2022
codingllama
reviewed
May 6, 2022
lib/multiplexer/proxyline.go
Outdated
| @@ -60,6 +60,38 @@ func (p *ProxyLine) String() string { | |||
| return fmt.Sprintf("PROXY %s %s %s %d %d\r\n", p.Protocol, p.Source.IP.String(), p.Destination.IP.String(), p.Source.Port, p.Destination.Port) | |||
| } | |||
|
|
|||
| // Bytes returns on-the wire bytes representation of proxy line conforming to the proxy v2 protocol | |||
| func (p *ProxyLine) Bytes() []byte { | |||
| var b []byte | |||
There was a problem hiding this comment.
Suggestion: use a bytes.Buffer?
There was a problem hiding this comment.
Good idea, I changed it
codingllama
approved these changes
May 10, 2022
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#11684 added support for proxy protocol v2 for SSH and Postgres but MySQL uses different code path and it was missing. This change fixes that.
It also adds tests for v2 protocol support for MySQL, Postgres, Mongo and Redis