cmd/relay: fix connection limits (ObolNetwork#1805)

Fixes issue with relay limits not being applied correctly getting stuck at 256 connections.

category: bug
ticket: none

app/app_test.go

@@ -26,6 +26,7 @@ import (
  "testing"
  "time"
 
+ k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
  "github.com/libp2p/go-libp2p"
  "github.com/libp2p/go-libp2p/core/host"
  "github.com/libp2p/go-libp2p/core/peer"
@@ -398,6 +399,58 @@ func TestInfoSync(t *testing.T) {
  require.NoError(t, err)
 }
 
+func TestRelayConnections(t *testing.T) {
+ ctx := context.Background()
+
+ relayAddr, relayErr := startRelay(ctx, t)
+
+ relays, err := p2p.NewRelays(ctx, []string{relayAddr}, "")
+ require.NoError(t, err)
+
+ relay, ok := relays[0].Peer()
+ require.True(t, ok)
+
+ const totalOK = 1024
+ okErrs := make(chan error, totalOK)
+ for i := 0; i < totalOK; i++ {
+ privKey, err := k1.GeneratePrivateKey()
+ require.NoError(t, err)
+
+ tcpNode, err := p2p.NewTCPNode(ctx, p2p.Config{}, privKey, p2p.NewOpenGater())
+ require.NoError(t, err)
+
+ go func(tcpNode host.Host) {
+ okErrs <- tcpNode.Connect(ctx, peer.AddrInfo{
+ ID: relay.ID,
+ Addrs: relay.Addrs,
+ })
+ }(tcpNode)
+ }
+
+ for i := 0; i < totalOK; i++ {
+ select {
+ case err := <-okErrs:
+ require.NoError(t, err, i)
+ case err := <-relayErr:
+ testutil.SkipIfBindErr(t, err)
+ require.NoError(t, err)
+ }
+ }
+
+ // One more should fail
+ privKey, err := k1.GeneratePrivateKey()
+ require.NoError(t, err)
+
+ tcpNode, err := p2p.NewTCPNode(ctx, p2p.Config{}, privKey, p2p.NewOpenGater())
+ require.NoError(t, err)
+
+ err = tcpNode.Connect(ctx, peer.AddrInfo{
+ ID: relay.ID,
+ Addrs: relay.Addrs,
+ })
+ require.Error(t, err)
+}
+
 // priorityAsserter asserts that all nodes resolved the same priorities.
 type priorityAsserter struct {
  asserter

cmd/relay/p2p.go

@@ -53,6 +53,7 @@ func startP2P(ctx context.Context, config Config, key *k1.PrivateKey, reporter m
  // Increase resource limits
  limiter := rcmgr.DefaultLimits
  limiter.SystemBaseLimit.ConnsInbound = config.MaxConns
+ limiter.SystemBaseLimit.Conns = config.MaxConns
  limiter.SystemBaseLimit.FD = config.MaxConns
  limiter.TransientBaseLimit = limiter.SystemBaseLimit