fix: future proof with > rcmgr.DefaultLimit for new enum rcmgr values

ipfs · Mar 20, 2023 · af79d84 · af79d84
1 parent 3830653
commit af79d84
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/core/node/libp2p/rcmgr.go b/core/node/libp2p/rcmgr.go
@@ -454,31 +454,31 @@ func ensureConnMgrMakeSenseVsResourceMgr(concreteLimits rcmgr.ConcreteLimitConfi
  rcm := concreteLimits.ToPartialLimitConfig()
 
  highWater := cfg.ConnMgr.HighWater.WithDefault(config.DefaultConnMgrHighWater)
- if rcm.System.Conns != rcmgr.Unlimited && int64(rcm.System.Conns) <= highWater {
+ if (rcm.System.Conns > rcmgr.DefaultLimit || rcm.System.Conns == rcmgr.BlockAllLimit) && int64(rcm.System.Conns) <= highWater {
  // nolint
  return fmt.Errorf(`
 Unable to initialize libp2p due to conflicting resource manager limit configuration.
 resource manager System.Conns (%d) must be bigger than ConnMgr.HighWater (%d)
 See: https://github.com/ipfs/kubo/blob/master/docs/libp2p-resource-management.md#how-does-the-resource-manager-resourcemgr-relate-to-the-connection-manager-connmgr
 `, rcm.System.Conns, highWater)
  }
- if rcm.System.ConnsInbound != rcmgr.Unlimited && int64(rcm.System.ConnsInbound) <= highWater {
+ if (rcm.System.ConnsInbound > rcmgr.DefaultLimit || rcm.System.ConnsInbound == rcmgr.BlockAllLimit) && int64(rcm.System.ConnsInbound) <= highWater {
  // nolint
  return fmt.Errorf(`
 Unable to initialize libp2p due to conflicting resource manager limit configuration.
 resource manager System.ConnsInbound (%d) must be bigger than ConnMgr.HighWater (%d)
 See: https://github.com/ipfs/kubo/blob/master/docs/libp2p-resource-management.md#how-does-the-resource-manager-resourcemgr-relate-to-the-connection-manager-connmgr
 `, rcm.System.ConnsInbound, highWater)
  }
- if rcm.System.Streams != rcmgr.Unlimited && int64(rcm.System.Streams) <= highWater {
+ if rcm.System.Streams > rcmgr.DefaultLimit || rcm.System.Streams == rcmgr.BlockAllLimit && int64(rcm.System.Streams) <= highWater {
  // nolint
  return fmt.Errorf(`
 Unable to initialize libp2p due to conflicting resource manager limit configuration.
 resource manager System.Streams (%d) must be bigger than ConnMgr.HighWater (%d)
 See: https://github.com/ipfs/kubo/blob/master/docs/libp2p-resource-management.md#how-does-the-resource-manager-resourcemgr-relate-to-the-connection-manager-connmgr
 `, rcm.System.Streams, highWater)
  }
- if rcm.System.StreamsInbound != rcmgr.Unlimited && int64(rcm.System.StreamsInbound) <= highWater {
+ if (rcm.System.StreamsInbound > rcmgr.DefaultLimit || rcm.System.StreamsInbound == rcmgr.BlockAllLimit) && int64(rcm.System.StreamsInbound) <= highWater {
  // nolint
  return fmt.Errorf(`
 Unable to initialize libp2p due to conflicting resource manager limit configuration.

diff --git a/core/node/libp2p/rcmgr_defaults.go b/core/node/libp2p/rcmgr_defaults.go
@@ -118,7 +118,7 @@ func createDefaultLimitConfig(cfg config.SwarmConfig) (limitConfig rcmgr.Concret
  // There are ways to break this, but this should catch most problems already.
  // We might improve this in the future.
  // See: https://github.com/ipfs/kubo/issues/9545
- if partialLimits.System.ConnsInbound != rcmgr.Unlimited && cfg.ConnMgr.Type.WithDefault(config.DefaultConnMgrType) != "none" {
+ if partialLimits.System.ConnsInbound > rcmgr.DefaultLimit && cfg.ConnMgr.Type.WithDefault(config.DefaultConnMgrType) != "none" {
  maxInboundConns := int64(partialLimits.System.ConnsInbound)
  if connmgrHighWaterTimesTwo := cfg.ConnMgr.HighWater.WithDefault(config.DefaultConnMgrHighWater) * 2; maxInboundConns < connmgrHighWaterTimesTwo {
  maxInboundConns = connmgrHighWaterTimesTwo
@@ -129,7 +129,7 @@ func createDefaultLimitConfig(cfg config.SwarmConfig) (limitConfig rcmgr.Concret
  }
 
  // Scale System.StreamsInbound as well, but use the existing ratio of StreamsInbound to ConnsInbound
- if partialLimits.System.StreamsInbound != rcmgr.Unlimited {
+ if partialLimits.System.StreamsInbound > rcmgr.DefaultLimit {
  partialLimits.System.StreamsInbound = rcmgr.LimitVal(maxInboundConns * int64(partialLimits.System.StreamsInbound) / int64(partialLimits.System.ConnsInbound))
  }
  partialLimits.System.ConnsInbound = rcmgr.LimitVal(maxInboundConns)

diff --git a/test/cli/rcmgr_test.go b/test/cli/rcmgr_test.go
@@ -81,10 +81,10 @@ func TestRcmgr(t *testing.T) {
  require.Equal(t, 0, res.ExitCode())
  limits := unmarshalLimits(t, res.Stdout.Bytes())
 
- if limits.System.ConnsInbound != rcmgr.Unlimited {
+ if limits.System.ConnsInbound > rcmgr.DefaultLimit {
  assert.GreaterOrEqual(t, limits.System.ConnsInbound, 800)
  }
- if limits.System.StreamsInbound != rcmgr.Unlimited {
+ if limits.System.StreamsInbound > rcmgr.DefaultLimit {
  assert.GreaterOrEqual(t, limits.System.StreamsInbound, 800)
  }
  })