[Merged by Bors] - p2p: disable autoscaling and drop from bootnodes on enough peers

p2p/dhtdiscovery/discovery.go

@@ -42,6 +42,12 @@
 	}
 }
 
+func WithHighPeers(peers int) Opt {
+	return func(d *Discovery) {
+		d.highPeers = peers
+	}
+}
+
 func WithBootnodes(bootnodes []peer.AddrInfo) Opt {
 	return func(d *Discovery) {
 		d.bootnodes = bootnodes
@@ -90,6 +96,7 @@
 		timeout:           30 * time.Second,
 		bootstrapDuration: 30 * time.Second,
 		minPeers:          20,
+		highPeers:         40,
 	}
 	for _, opt := range opts {
 		opt(&d)
@@ -121,10 +128,10 @@
 	// how often to check if we have enough peers
 	period time.Duration
 	// timeout used for connections
-	timeout           time.Duration
-	bootstrapDuration time.Duration
-	minPeers          int
-	backup, bootnodes []peer.AddrInfo
+	timeout             time.Duration
+	bootstrapDuration   time.Duration
+	minPeers, highPeers int
+	backup, bootnodes   []peer.AddrInfo
 }
 
 func (d *Discovery) Start() {
@@ -157,6 +164,14 @@
 					zap.Int("required", d.minPeers),
 					zap.Int("connected", connected),
 				)
+				if connected >= d.highPeers {
+					for _, boot := range d.bootnodes {
+						if err := d.h.Network().ClosePeer(boot.ID); err != nil {
+							d.logger.Warn("failed to close bootnode connection",
+								zap.Stringer("address", boot), zap.Error(err))
+						}
+					}
+				}
 			} else {
 				d.connect(&connEg, d.backup)
 				// no reason to spend more resources if we got enough from backup

p2p/host.go

@@ -66,6 +66,7 @@
 	MinPeers               int         `mapstructure:"min-peers"`
 	LowPeers               int         `mapstructure:"low-peers"`
 	HighPeers              int         `mapstructure:"high-peers"`
+	AutoscalePeers         bool        `mapstructure:"autoscale-peers"`
 	AdvertiseAddress       string      `mapstructure:"advertise-address"`
 	AcceptQueue            int         `mapstructure:"p2p-accept-queue"`
 	Metrics                bool        `mapstructure:"p2p-metrics"`
@@ -179,7 +180,7 @@
 		lopts = append(lopts, libp2p.ForceReachabilityPrivate())
 	}
 	if cfg.Metrics {
-		lopts = append(lopts, setupResourcesManager(cfg.HighPeers))
+		lopts = append(lopts, setupResourcesManager(cfg))
 	}
 	if !cfg.DisableNatPort {
 		lopts = append(lopts, libp2p.NATPortMap())
@@ -200,17 +201,18 @@
 	return Upgrade(h, opts...)
 }
 
-func setupResourcesManager(highPeers int) func(cfg *libp2p.Config) error {
+func setupResourcesManager(hostcfg Config) func(cfg *libp2p.Config) error {
 	return func(cfg *libp2p.Config) error {
 		rcmgrObs.MustRegisterWith(prometheus.DefaultRegisterer)
 		str, err := rcmgrObs.NewStatsTraceReporter()
 		if err != nil {
 			return err
 		}
+		highPeers := hostcfg.HighPeers
 		limits := rcmgr.DefaultLimits
 		limits.SystemBaseLimit.ConnsInbound = highPeers
 		limits.SystemBaseLimit.ConnsOutbound = highPeers
-		limits.SystemBaseLimit.Conns = 2 * highPeers
+		limits.SystemBaseLimit.Conns = highPeers + hostcfg.MinPeers
 		limits.SystemBaseLimit.FD = 2 * highPeers
 		limits.SystemBaseLimit.StreamsInbound = 8 * highPeers
 		limits.SystemBaseLimit.StreamsOutbound = 8 * highPeers
@@ -219,13 +221,19 @@
 		limits.ServiceBaseLimit.StreamsOutbound = 8 * highPeers
 		limits.ServiceBaseLimit.Streams = 16 * highPeers
 
+		limits.TransientBaseLimit.Conns = hostcfg.MinPeers
+
 		limits.ProtocolBaseLimit.StreamsInbound = 8 * highPeers
 		limits.ProtocolBaseLimit.StreamsOutbound = 8 * highPeers
 		limits.ProtocolBaseLimit.Streams = 16 * highPeers
 		libp2p.SetDefaultServiceLimits(&limits)
 
+		concrete := limits.AutoScale()
+		if !hostcfg.AutoscalePeers {
+			concrete = limits.Scale(0, 0)
+		}
 		mgr, err := rcmgr.NewResourceManager(
-			rcmgr.NewFixedLimiter(limits.AutoScale()),
+			rcmgr.NewFixedLimiter(concrete),
 			rcmgr.WithTraceReporter(str),
 		)
 		if err != nil {

p2p/upgrade.go

@@ -115,6 +115,8 @@ func Upgrade(h host.Host, opts ...Opt) (*Host, error) {
 	}
 
 	dopts := []discovery.Opt{
+		discovery.WithMinPeers(cfg.MinPeers),
+		discovery.WithHighPeers(cfg.HighPeers),
 		discovery.WithDir(cfg.DataDir),
 		discovery.WithBootnodes(bootnodes),
 		discovery.WithLogger(fh.logger.Zap()),