highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-12-08 20:03:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: use cfg.MinBackoff instead of defaultBackoff

Browse Source
This commit is contained in:
Conner Fromknecht
2019-01-03 18:38:36 -08:00
parent aa75680dcf
commit d3b5326ae7
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server.go
View File

@@ -48,10 +48,6 @@ const (
// connected to. // connected to.
defaultMinPeers = 3 defaultMinPeers = 3
// defaultBackoff is the starting point for exponential backoff for
// reconnecting to persistent peers.
defaultBackoff = time.Second
// defaultStableConnDuration is a floor under which all reconnection // defaultStableConnDuration is a floor under which all reconnection
// attempts will apply exponential randomized backoff. Connections // attempts will apply exponential randomized backoff. Connections
// durations exceeding this value will be eligible to have their // durations exceeding this value will be eligible to have their
@@ -1751,7 +1747,7 @@ func (s *server) establishPersistentConnections() error {
// persistent connection with. // persistent connection with.
s.persistentPeers[pubStr] = struct{}{} s.persistentPeers[pubStr] = struct{}{}
if _, ok := s.persistentPeersBackoff[pubStr]; !ok { if _, ok := s.persistentPeersBackoff[pubStr]; !ok {
s.persistentPeersBackoff[pubStr] = defaultBackoff s.persistentPeersBackoff[pubStr] = cfg.MinBackoff
} }
for _, address := range nodeAddr.addresses { for _, address := range nodeAddr.addresses {
@@ -2022,7 +2018,7 @@ func (s *server) nextPeerBackoff(pubStr string,
backoff, ok := s.persistentPeersBackoff[pubStr] backoff, ok := s.persistentPeersBackoff[pubStr]
if !ok { if !ok {
// If an existing backoff was unknown, use the default. // If an existing backoff was unknown, use the default.
return defaultBackoff return cfg.MinBackoff
} }
// If the peer failed to start properly, we'll just use the previous // If the peer failed to start properly, we'll just use the previous
@@ -2044,17 +2040,17 @@ func (s *server) nextPeerBackoff(pubStr string,
// reduce the timeout duration by the length of the connection after // reduce the timeout duration by the length of the connection after
// applying randomized exponential backoff. We'll only apply this in the // applying randomized exponential backoff. We'll only apply this in the
// case that: // case that:
// reb(curBackoff) - connDuration > defaultBackoff // reb(curBackoff) - connDuration > cfg.MinBackoff
relaxedBackoff := computeNextBackoff(backoff) - connDuration relaxedBackoff := computeNextBackoff(backoff) - connDuration
if relaxedBackoff > defaultBackoff { if relaxedBackoff > cfg.MinBackoff {
return relaxedBackoff return relaxedBackoff
} }
// Lastly, if reb(currBackoff) - connDuration <= defaultBackoff, meaning // Lastly, if reb(currBackoff) - connDuration <= cfg.MinBackoff, meaning
// the stable connection lasted much longer than our previous backoff. // the stable connection lasted much longer than our previous backoff.
// To reward such good behavior, we'll reconnect after the default // To reward such good behavior, we'll reconnect after the default
// timeout. // timeout.
return defaultBackoff return cfg.MinBackoff
} }
// shouldDropConnection determines if our local connection to a remote peer // shouldDropConnection determines if our local connection to a remote peer
@@ -2710,7 +2706,7 @@ func (s *server) ConnectToPeer(addr *lnwire.NetAddress, perm bool) error {
s.persistentPeers[targetPub] = struct{}{} s.persistentPeers[targetPub] = struct{}{}
if _, ok := s.persistentPeersBackoff[targetPub]; !ok { if _, ok := s.persistentPeersBackoff[targetPub]; !ok {
s.persistentPeersBackoff[targetPub] = defaultBackoff s.persistentPeersBackoff[targetPub] = cfg.MinBackoff
} }
s.persistentConnReqs[targetPub] = append( s.persistentConnReqs[targetPub] = append(
s.persistentConnReqs[targetPub], connReq) s.persistentConnReqs[targetPub], connReq)