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

server: Change proxyprotocol to lazy mode #36301

Merged
merged 16 commits into from
Aug 11, 2022
Merged

server: Change proxyprotocol to lazy mode #36301

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
df06887
Change proxyprotocol to lazy mode
blacktear23 Jul 19, 2022
db8a4ed
Fix go mod
blacktear23 Jul 19, 2022
b45d869
Merge branch 'master' into proxyprotocol-lazy-mode
blacktear23 Jul 19, 2022
289f0f3
Update go-proxyprotocol version
blacktear23 Jul 19, 2022
b7261e5
Merge branch 'master' into proxyprotocol-lazy-mode
blacktear23 Jul 19, 2022
2df6168
Merge branch 'master' into proxyprotocol-lazy-mode
blacktear23 Jul 20, 2022
799f4f4
Merge branch 'master' into proxyprotocol-lazy-mode
blacktear23 Aug 2, 2022
d6aef3b
Add deprecated comments for -proxy-protocol-header-timeout
blacktear23 Aug 2, 2022
94b0615
Merge branch 'master' into proxyprotocol-lazy-mode
blacktear23 Aug 2, 2022
55c86bf
Merge branch 'master' into proxyprotocol-lazy-mode
blacktear23 Aug 7, 2022
f4f8582
Merge branch 'master' into proxyprotocol-lazy-mode
xhebox Aug 10, 2022
46025ee
upgrade dep
hawkingrei Aug 11, 2022
603e6f0
update deps
xhebox Aug 11, 2022
e1f88d1
*: fix CI
xhebox Aug 11, 2022
cbaf9a7
Merge branch 'master' into proxyprotocol-lazy-mode
ti-chi-bot Aug 11, 2022
90a7858
Merge branch 'master' into proxyprotocol-lazy-mode
ti-chi-bot Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Jeffail/gabs/v2 v2.5.1
github.com/Shopify/sarama v1.29.0
github.com/blacktear23/go-proxyprotocol v1.0.2
github.com/aws/aws-sdk-go v1.36.30
github.com/blacktear23/go-proxyprotocol v1.0.0
github.com/carlmjohnson/flagext v0.21.0
github.com/cheggaaa/pb/v3 v3.0.8
github.com/cheynewallace/tabby v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/biogo/store v0.0.0-20160505134755-913427a1d5e8/go.mod h1:Iev9Q3MErcn+w3UOJD/DkEzllvugfdx7bGcMOFhvr/4=
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
github.com/blacktear23/go-proxyprotocol v1.0.0 h1:WmMmtZanGEfIHnJN9N3A4Pl6mM69D+GxEph2eOaCf7g=
github.com/blacktear23/go-proxyprotocol v1.0.0/go.mod h1:fbqiWSHMxaW0KsJ3SHjpxOMbTpIaQSMRn1GRd+oPyEw=
github.com/blacktear23/go-proxyprotocol v1.0.2 h1:zR7PZeoU0wAkElcIXenFiy3R56WB6A+UEVi4c6RH8wo=
github.com/blacktear23/go-proxyprotocol v1.0.2/go.mod h1:FSCbgnRZrQXazBLL5snfBbrcFSMtcmUDhSRb9OfFA1o=
github.com/carlmjohnson/flagext v0.21.0 h1:/c4uK3ie786Z7caXLcIMvePNSSiH3bQVGDvmGLMme60=
github.com/carlmjohnson/flagext v0.21.0/go.mod h1:Eenv0epIUAr4NuedNmkzI8WmBmjIxZC239XcKxYS2ac=
github.com/cenk/backoff v2.0.0+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE=
Expand Down
3 changes: 2 additions & 1 deletion server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"math/rand"
"net"
"net/http" //nolint:goimports

// For pprof
_ "net/http/pprof" // #nosec G108
"os"
Expand Down Expand Up @@ -276,7 +277,7 @@ func NewServer(cfg *config.Config, driver IDriver) (*Server, error) {
if proxyTarget == nil {
proxyTarget = s.socket
}
ppListener, err := proxyprotocol.NewListener(proxyTarget, s.cfg.ProxyProtocol.Networks,
ppListener, err := proxyprotocol.NewLazyListener(proxyTarget, s.cfg.ProxyProtocol.Networks,
int(s.cfg.ProxyProtocol.HeaderTimeout))
if err != nil {
logutil.BgLogger().Error("ProxyProtocol networks parameter invalid")
Expand Down
2 changes: 1 addition & 1 deletion tidb-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var (

// PROXY Protocol
proxyProtocolNetworks = flag.String(nmProxyProtocolNetworks, "", "proxy protocol networks allowed IP or *, empty mean disable proxy protocol support")
proxyProtocolHeaderTimeout = flag.Uint(nmProxyProtocolHeaderTimeout, 5, "proxy protocol header read timeout, unit is second.")
proxyProtocolHeaderTimeout = flag.Uint(nmProxyProtocolHeaderTimeout, 5, "proxy protocol header read timeout, unit is second. (Deprecated: as proxy protocol using lazy mode, header read timeout no longer used)")

// Security
initializeSecure = flagBoolean(nmInitializeSecure, false, "bootstrap tidb-server in secure mode")
Expand Down