Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
feat(router): configurable connection manager watermarks with 1000/4000 defaults
Antonio Ojeac71abbed2181
diff --git a/cmd/sam-router/main.go b/cmd/sam-router/main.goindex 1f0bff5c..80a678e3 100644--- a/cmd/sam-router/main.go+++ b/cmd/sam-router/main.go@@ -41,6 +41,8 @@ var (logLevel stringdhtProviderAddrTTL time.DurationdhtMaxRecordAge time.Duration+ lowWaterMark int+ highWaterMark int)var logger = golog.Logger("sam-router-cli")@@ -76,6 +78,8 @@ func main() {AllowLoopback: allowLoopback,DHTProviderAddrTTL: dhtProviderAddrTTL,DHTMaxRecordAge: dhtMaxRecordAge,+ LowWaterMark: lowWaterMark,+ HighWaterMark: highWaterMark,}r, err := router.NewRouter(cmd.Context(), opts)@@ -110,6 +114,8 @@ func main() {rootCmd.Flags().StringVar(&logLevel, "log-level", "info", "Log level (debug, info, warn, error)")rootCmd.Flags().DurationVar(&dhtProviderAddrTTL, "dht-provider-addr-ttl", 0, "Time-To-Live for DHT provider addresses (0s uses library default)")rootCmd.Flags().DurationVar(&dhtMaxRecordAge, "dht-max-record-age", 0, "Maximum age for DHT records (0s uses library default)")+ rootCmd.Flags().IntVar(&lowWaterMark, "low-watermark", 1000, "Connection manager low watermark limit")+ rootCmd.Flags().IntVar(&highWaterMark, "high-watermark", 4000, "Connection manager high watermark limit")ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)defer cancel()diff --git a/internal/router/config.go b/internal/router/config.goindex 176e0a68..ce18dbc2 100644--- a/internal/router/config.go+++ b/internal/router/config.go@@ -39,6 +39,8 @@ type Options struct {LogVerbose boolDHTProviderAddrTTL time.DurationDHTMaxRecordAge time.Duration+ LowWaterMark int+ HighWaterMark int// RequiredRole restricts enrollment and startup to only accept tokens containing this role.RequiredRole string}@@ -57,6 +59,12 @@ func (o *Options) Default() {if o.LeaseRenewInterval <= 0 {o.LeaseRenewInterval = 30 * time.Second}+ if o.LowWaterMark <= 0 {+ o.LowWaterMark = 1000+ }+ if o.HighWaterMark <= 0 {+ o.HighWaterMark = 4000+ }if o.KeysDBPath == "" {o.KeysDBPath = "router.key"}diff --git a/internal/router/router.go b/internal/router/router.goindex 99599f3a..7e4d4d78 100644--- a/internal/router/router.go+++ b/internal/router/router.go@@ -55,9 +55,9 @@ import (var logger = golog.Logger("sam-router")const (- LowWaterMark = 100- HighWaterMark = 400- ConnGracePeriod = 1 * time.Minute+ DefaultLowWaterMark = 1000+ DefaultHighWaterMark = 4000+ ConnGracePeriod = 1 * time.Minute)type relayACL struct {@@ -162,7 +162,15 @@ func (r *Router) Start() error {}// 4. Initialize libp2p host- cm, err := connmgr.NewConnManager(LowWaterMark, HighWaterMark, connmgr.WithGracePeriod(ConnGracePeriod))+ low := r.config.LowWaterMark+ if low <= 0 {+ low = DefaultLowWaterMark+ }+ high := r.config.HighWaterMark+ if high <= 0 {+ high = DefaultHighWaterMark+ }+ cm, err := connmgr.NewConnManager(low, high, connmgr.WithGracePeriod(ConnGracePeriod))if err != nil {return fmt.Errorf("failed to create connection manager: %w", err)}diff --git a/internal/router/router_test.go b/internal/router/router_test.goindex aa3a2536..6f4a66a7 100644--- a/internal/router/router_test.go+++ b/internal/router/router_test.go@@ -777,3 +777,20 @@ func TestRouterEnrollWithTokensResolution(t *testing.T) {}})}++func TestRouterConnectionManagerWatermarks(t *testing.T) {+ opts := Options{+ LowWaterMark: 500,+ HighWaterMark: 1500,+ }+ opts.Default()+ if opts.LowWaterMark != 500 || opts.HighWaterMark != 1500 {+ t.Fatalf("expected explicit watermarks to be preserved, got Low: %d, High: %d", opts.LowWaterMark, opts.HighWaterMark)+ }++ defaultOpts := Options{}+ defaultOpts.Default()+ if defaultOpts.LowWaterMark != 1000 || defaultOpts.HighWaterMark != 4000 {+ t.Fatalf("expected default watermarks 1000/4000, got Low: %d, High: %d", defaultOpts.LowWaterMark, defaultOpts.HighWaterMark)+ }+}