Reconnect to initial list

multiversx · Oct 31, 2019 · 25f3852 · 25f3852
1 parent d3f1b53
commit 25f3852
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/p2p/libp2p/discovery/kadDhtDiscoverer.go b/p2p/libp2p/discovery/kadDhtDiscoverer.go
@@ -1,13 +1,15 @@
 package discovery
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
 	"github.com/ElrondNetwork/elrond-go/core/logger"
 	"github.com/ElrondNetwork/elrond-go/p2p"
 	"github.com/ElrondNetwork/elrond-go/p2p/libp2p"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
+	"github.com/libp2p/go-libp2p-kbucket"
 )
 
 var peerDiscoveryTimeout = 10 * time.Second
@@ -101,11 +103,28 @@ func (kdd *KadDhtDiscoverer) connectToInitialAndBootstrap() {
 
 		kdd.mutKadDht.Lock()
 		go func() {
+			i := 0
 			for {
 				if kdd.initc {
 					err := kdd.kadDHT.BootstrapOnce(ctx, cfg)
-					if err != nil {
-						log.Warn("error bootstrapping: %s", err)
+					if err == kbucket.ErrLookupFailure {
+						log.Warn(fmt.Sprintf("KDD: Reconnet to init: %s", err))
+						chanRecInit := kdd.connectToOnePeerFromInitialPeersList(
+							kdd.refreshInterval,
+							kdd.initialPeersList)
+						<-chanRecInit
+
+					} else if err != nil {
+						log.Warn(fmt.Sprintf("KDD: error bootstrapping: %s", err))
+					}
+				} else {
+					i++
+					if (i % 10) == 0 {
+						log.Warn("KDD: Reconnet to init in pause")
+						chanRecInit := kdd.connectToOnePeerFromInitialPeersList(
+							kdd.refreshInterval,
+							kdd.initialPeersList)
+						<-chanRecInit
 					}
 				}
 				select {

diff --git a/p2p/libp2p/libp2pConnectionMonitor.go b/p2p/libp2p/libp2pConnectionMonitor.go
@@ -68,6 +68,14 @@ func (lcm *libp2pConnectionMonitor) ThresholdRandomTrim() int {
 	return math.MaxInt32
 }
 
+// Request a reconnet to initial list
+func (lcm *libp2pConnectionMonitor) doReconn() {
+	select {
+	case lcm.chDoReconnect <- struct{}{}:
+	default:
+	}
+}
+
 // Connected is called when a connection opened
 func (lcm *libp2pConnectionMonitor) Connected(netw network.Network, conn network.Conn) {
 	if len(netw.Conns()) > lcm.ThresholdDiscoveryPause() {
@@ -78,21 +86,20 @@ func (lcm *libp2pConnectionMonitor) Connected(netw network.Network, conn network
 		for i := lcm.ThresholdDiscoveryPause(); i < len(sorted); i++ {
 			netw.ClosePeer(sorted[i])
 		}
+		lcm.doReconn()
 	}
 }
 
 // Disconnected is called when a connection closed
 func (lcm *libp2pConnectionMonitor) Disconnected(netw network.Network, conn network.Conn) {
 	currentConnCount := len(netw.Conns())
 	if currentConnCount < ThresholdMinimumConnectedPeers {
-		select {
-		case lcm.chDoReconnect <- struct{}{}:
-		default:
-		}
+		lcm.doReconn()
 	}
 
 	if currentConnCount < lcm.ThresholdDiscoveryResume() && lcm.reconnecter != nil {
 		lcm.reconnecter.Resume()
+		lcm.doReconn()
 	}
 }