Merge pull request #101 from libp2p/fix/non-default-emergency-trimming

make emergency trimming optional, disabled by default
libp2p · Jan 14, 2022 · b2736df · b2736df
2 parents 1a3d6a6 + ee3785b
commit b2736df
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/p2p/net/connmgr/connmgr.go b/p2p/net/connmgr/connmgr.go
@@ -129,8 +129,12 @@ func NewConnManager(low, hi int, opts ...Option) (*BasicConnMgr, error) {
 	}
 	cm.ctx, cm.cancel = context.WithCancel(context.Background())
 
-	// When we're running low on memory, immediately trigger a trim.
-	cm.unregisterWatchdog = watchdog.RegisterPostGCNotifee(cm.memoryEmergency)
+	if cfg.emergencyTrim {
+		// When we're running low on memory, immediately trigger a trim.
+		cm.unregisterWatchdog = watchdog.RegisterPostGCNotifee(cm.memoryEmergency)
+	} else {
+		cm.unregisterWatchdog = func() {}
+	}
 
 	decay, _ := NewDecayer(cfg.decayer, cm)
 	cm.decayer = decay

diff --git a/p2p/net/connmgr/options.go b/p2p/net/connmgr/options.go
@@ -12,6 +12,7 @@ type config struct {
 	gracePeriod   time.Duration
 	silencePeriod time.Duration
 	decayer       *DecayerCfg
+	emergencyTrim bool
 }
 
 // Option represents an option for the basic connection manager.
@@ -50,3 +51,11 @@ func WithSilencePeriod(p time.Duration) Option {
 		return nil
 	}
 }
+
+// WithEmergencyTrim is an option to enable trimming connections on memory emergency.
+func WithEmergencyTrim(enable bool) Option {
+	return func(cfg *config) error {
+		cfg.emergencyTrim = enable
+		return nil
+	}
+}