Skip to content

fsm: Speed-up initial connection time #2878

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

Closed
rastislavs wants to merge 1 commit into from
Closed

fsm: Speed-up initial connection time #2878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 22 additions & 18 deletions pkg/server/fsm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
)

const (
minConnectRetryInterval = 5
minConnectRetryInterval = 1
)

type fsmStateReasonType uint8
Expand Down Expand Up @@ -494,7 +494,7 @@ func (h *fsmHandler) connectLoop(ctx context.Context, wg *sync.WaitGroup) {
defer wg.Done()
fsm := h.fsm

retry, addr, port, password, ttl, ttlMin, mss, localAddress, localPort, bindInterface := func() (int, string, int, string, uint8, uint8, uint16, string, int, string) {
retryInterval, addr, port, password, ttl, ttlMin, mss, localAddress, localPort, bindInterface := func() (int, string, int, string, uint8, uint8, uint16, string, int, string) {
fsm.lock.RLock()
defer fsm.lock.RUnlock()

Expand Down Expand Up @@ -524,27 +524,31 @@ func (h *fsmHandler) connectLoop(ctx context.Context, wg *sync.WaitGroup) {
return tick, addr, port, password, ttl, ttlMin, fsm.pConf.Transport.Config.TcpMss, fsm.pConf.Transport.Config.LocalAddress, int(fsm.pConf.Transport.Config.LocalPort), fsm.pConf.Transport.Config.BindInterface
}()

tick := minConnectRetryInterval
tick := 0
for {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
timer := time.NewTimer(time.Duration(r.Intn(tick)+tick) * time.Second)
select {
case <-ctx.Done():
fsm.logger.Debug("stop connect loop",
log.Fields{
"Topic": "Peer",
"Key": addr})
timer.Stop()
return
case <-timer.C:
if fsm.logger.GetLevel() >= log.DebugLevel {
fsm.logger.Debug("try to connect",
if tick > 0 {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
timer := time.NewTimer(time.Duration(r.Intn(tick)+tick) * time.Second)
select {
case <-ctx.Done():
fsm.logger.Debug("stop connect loop",
log.Fields{
"Topic": "Peer",
"Key": addr})
timer.Stop()
return
case <-timer.C:
// try to connect
}
}

if fsm.logger.GetLevel() >= log.DebugLevel {
fsm.logger.Debug("try to connect",
log.Fields{
"Topic": "Peer",
"Key": addr})
}

laddr, err := net.ResolveTCPAddr("tcp", net.JoinHostPort(localAddress, strconv.Itoa(localPort)))
if err != nil {
fsm.logger.Warn("failed to resolve local address",
Expand All @@ -556,7 +560,7 @@ func (h *fsmHandler) connectLoop(ctx context.Context, wg *sync.WaitGroup) {
if err == nil {
d := net.Dialer{
LocalAddr: laddr,
Timeout: time.Duration(tick-1) * time.Second,
Timeout: time.Duration(max(retryInterval-1, minConnectRetryInterval)) * time.Second,
Control: func(network, address string, c syscall.RawConn) error {
return dialerControl(fsm.logger, network, address, c, ttl, ttlMin, mss, password, bindInterface)
},
Expand Down Expand Up @@ -594,7 +598,7 @@ func (h *fsmHandler) connectLoop(ctx context.Context, wg *sync.WaitGroup) {
}
}
}
tick = retry
tick = retryInterval
}
}

Expand Down
Loading