Exponential backoff for failed accept connections

This commit is contained in:
Milos Gajdos 2019-10-15 15:58:33 +01:00
parent fed5af68e6
commit 4936a2e1a5
No known key found for this signature in database
GPG Key ID: 8B31058CC55DFD4F

View File

@ -19,6 +19,7 @@ import (
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
"github.com/micro/go-micro/tunnel" "github.com/micro/go-micro/tunnel"
tun "github.com/micro/go-micro/tunnel/transport" tun "github.com/micro/go-micro/tunnel/transport"
"github.com/micro/go-micro/util/backoff"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/util/log"
) )
@ -266,24 +267,28 @@ func (n *network) handleNetConn(sess tunnel.Session, msg chan *transport.Message
// acceptNetConn accepts connections from NetworkChannel // acceptNetConn accepts connections from NetworkChannel
func (n *network) acceptNetConn(l tunnel.Listener, recv chan *transport.Message) { func (n *network) acceptNetConn(l tunnel.Listener, recv chan *transport.Message) {
var i int
for { for {
// accept a connection // accept a connection
conn, err := l.Accept() conn, err := l.Accept()
if err != nil {
sleep := backoff.Do(i)
log.Debugf("Network tunnel [%s] accept error: %v, backing off for %v", ControlChannel, err, sleep)
time.Sleep(sleep)
if i > 5 {
i = 0
}
i++
continue
}
select { select {
case <-n.closed: case <-n.closed:
// only try to close the connection if it has been successfully opened if err := conn.Close(); err != nil {
if err != nil { log.Debugf("Network tunnel [%s] failed to close connection: %v", NetworkChannel, err)
if closeErr := conn.Close(); closeErr != nil {
log.Debugf("Network tunnel [%s] failed to close connection: %v", NetworkChannel, closeErr)
}
} }
return return
default: default:
if err != nil {
log.Debugf("Network tunnel [%s] accept error: %v", NetworkChannel, err)
continue
}
// go handle NetworkChannel connection // go handle NetworkChannel connection
go n.handleNetConn(conn, recv) go n.handleNetConn(conn, recv)
} }
@ -562,24 +567,29 @@ func (n *network) handleCtrlConn(sess tunnel.Session, msg chan *transport.Messag
// acceptCtrlConn accepts connections from ControlChannel // acceptCtrlConn accepts connections from ControlChannel
func (n *network) acceptCtrlConn(l tunnel.Listener, recv chan *transport.Message) { func (n *network) acceptCtrlConn(l tunnel.Listener, recv chan *transport.Message) {
var i int
for { for {
// accept a connection // accept a connection
conn, err := l.Accept() conn, err := l.Accept()
if err != nil {
sleep := backoff.Do(i)
log.Debugf("Network tunnel [%s] accept error: %v, backing off for %v", ControlChannel, err, sleep)
time.Sleep(sleep)
if i > 5 {
// reset the counter
i = 0
}
i++
continue
}
select { select {
case <-n.closed: case <-n.closed:
// only try to close the connection if it has been successfully opened if err := conn.Close(); err != nil {
if err != nil { log.Debugf("Network tunnel [%s] failed to close connection: %v", ControlChannel, err)
if closeErr := conn.Close(); closeErr != nil {
log.Debugf("Network tunnel [%s] failed to close connection: %v", ControlChannel, closeErr)
}
} }
return return
default: default:
if err != nil {
log.Debugf("Network tunnel [%s] accept error: %v", ControlChannel, err)
continue
}
// go handle ControlChannel connection // go handle ControlChannel connection
go n.handleCtrlConn(conn, recv) go n.handleCtrlConn(conn, recv)
} }