rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-13 13:50:16 +00:00
Code Issues Releases Wiki Activity

Configure HandshakeTimeout in websocket.Dialer

Browse Source 
To prevent agent from being hung in the middle of Websocket Session
Handshake, We'd better to set HandshakeTimeout

Related to https://github.com/rancher/rancher/issues/21117
This commit is contained in:
Yuki Nishiwaki
2019-06-26 00:55:50 +09:00
parent f5744043a6
commit 129bbd3ca3
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clientbase/common.go
View File

@@ -277,7 +277,7 @@ func NewAPIClient(opts *ClientOpts) (APIBaseClient, error) {
result.Ops = &APIOperations{ result.Ops = &APIOperations{
Opts: opts, Opts: opts,
Client: client, Client: client,
Dialer: &websocket.Dialer{}, Dialer: &websocket.Dialer{HandshakeTimeout: 10 * time.Second},
Types: result.Types, Types: result.Types,
} }

2
pkg/remotedialer/client.go
View File

@@ -22,7 +22,7 @@ func connectToProxy(proxyURL string, headers http.Header, auth ConnectAuthorizer
logrus.WithField("url", proxyURL).Info("Connecting to proxy") logrus.WithField("url", proxyURL).Info("Connecting to proxy")
if dialer == nil { if dialer == nil {
dialer = &websocket.Dialer{} dialer = &websocket.Dialer{HandshakeTimeout: 10 * time.Second}
} }
ws, _, err := dialer.Dial(proxyURL, headers) ws, _, err := dialer.Dial(proxyURL, headers)
if err != nil { if err != nil {

1
pkg/remotedialer/peer.go
View File

@@ -79,6 +79,7 @@ func (p *peer) start(ctx context.Context, s *Server) {
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
}, },
HandshakeTimeout: 10 * time.Second,
} }
outer: outer: