Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
address review: rename to defaultDHTProbeTimeout, fall back on <=0, fix timer leak in test
Fernando Marinob341328d296b
diff --git a/internal/node/service_registry.go b/internal/node/service_registry.goindex 280f2718..37872d1f 100644--- a/internal/node/service_registry.go+++ b/internal/node/service_registry.go@@ -38,7 +38,7 @@ type backendProber interface {Probe(ctx context.Context) error}-// dhtProbeTimeout is the default bound on one backend probe before+// defaultDHTProbeTimeout is the default bound on one backend probe before// advertising, used when a ServiceRegistry isn't given an explicit// BackendProbeTimeout (see Options.BackendProbeTimeout / --backend-probe-// timeout). Command-spawned backends (sam-node.yaml's `command`, launched as@@ -46,7 +46,7 @@ type backendProber interface {// request - a moderately-featured interpreted-language MCP server's own// import/startup cost alone can exceed 2s - so this is a floor, not// something every backend is expected to meet.-const dhtProbeTimeout = 2 * time.Second+const defaultDHTProbeTimeout = 2 * time.Second// advertisable reports whether a service is fit to be published to the DHT.//@@ -78,7 +78,7 @@ type ServiceRegistry struct {reprovideNow func()// backendProbeTimeout bounds each backend probe in advertisable. Defaults- // to dhtProbeTimeout; override with SetBackendProbeTimeout.+ // to defaultDHTProbeTimeout; override with SetBackendProbeTimeout.backendProbeTimeout time.Duration}@@ -86,12 +86,12 @@ func NewServiceRegistry(d dhtProvider) *ServiceRegistry {return &ServiceRegistry{services: map[string]Service{},dht: d,- backendProbeTimeout: dhtProbeTimeout,+ backendProbeTimeout: defaultDHTProbeTimeout,}}// SetBackendProbeTimeout overrides the default backend probe timeout-// (dhtProbeTimeout). A zero or negative duration is a no-op, so callers can+// (defaultDHTProbeTimeout). A zero or negative duration is a no-op, so callers can// pass an unset Options.BackendProbeTimeout straight through without an// explicit zero-check.func (r *ServiceRegistry) SetBackendProbeTimeout(d time.Duration) {@@ -103,10 +103,17 @@ func (r *ServiceRegistry) SetBackendProbeTimeout(d time.Duration) {r.backendProbeTimeout = d}-// probeTimeout returns the current backend probe timeout.+// probeTimeout returns the current backend probe timeout, falling back to+// defaultDHTProbeTimeout for a zero-initialized registry (e.g. a struct+// literal built directly in a test, bypassing NewServiceRegistry) so it+// behaves the same as a properly constructed one rather than timing out+// every probe immediately.func (r *ServiceRegistry) probeTimeout() time.Duration {r.mu.RLock()defer r.mu.RUnlock()+ if r.backendProbeTimeout <= 0 {+ return defaultDHTProbeTimeout+ }return r.backendProbeTimeout}diff --git a/internal/node/service_registry_test.go b/internal/node/service_registry_test.goindex 8d724aae..a07a3c17 100644--- a/internal/node/service_registry_test.go+++ b/internal/node/service_registry_test.go@@ -293,15 +293,17 @@ func newSlowProbingSvc(name string, delay time.Duration) *slowProbingService {}func (p *slowProbingService) Probe(ctx context.Context) error {+ timer := time.NewTimer(p.delay)+ defer timer.Stop()select {- case <-time.After(p.delay):+ case <-timer.C:return nilcase <-ctx.Done():return ctx.Err()}}-// The bug behind #376: dhtProbeTimeout was a hard-coded 2s with no way to+// The bug behind #376: defaultDHTProbeTimeout was a hard-coded 2s with no way to// raise it, so a backend whose own cold-start cost alone exceeds that -// measured in practice for moderately-featured MCP server stacks - could// never be advertised on its first registration. SetBackendProbeTimeout@@ -338,10 +340,10 @@ func TestServiceRegistry_BackendProbeTimeoutIsConfigurable(t *testing.T) {}})- t.Run("NewServiceRegistry defaults to dhtProbeTimeout unchanged", func(t *testing.T) {+ t.Run("NewServiceRegistry defaults to defaultDHTProbeTimeout unchanged", func(t *testing.T) {r := NewServiceRegistry(&fakeDHT{})- if got := r.probeTimeout(); got != dhtProbeTimeout {- t.Errorf("default probe timeout = %v, want %v (unchanged default behaviour)", got, dhtProbeTimeout)+ if got := r.probeTimeout(); got != defaultDHTProbeTimeout {+ t.Errorf("default probe timeout = %v, want %v (unchanged default behaviour)", got, defaultDHTProbeTimeout)}})@@ -349,8 +351,8 @@ func TestServiceRegistry_BackendProbeTimeoutIsConfigurable(t *testing.T) {r := NewServiceRegistry(&fakeDHT{})r.SetBackendProbeTimeout(0)r.SetBackendProbeTimeout(-1 * time.Second)- if got := r.probeTimeout(); got != dhtProbeTimeout {- t.Errorf("probe timeout after no-op sets = %v, want unchanged %v", got, dhtProbeTimeout)+ if got := r.probeTimeout(); got != defaultDHTProbeTimeout {+ t.Errorf("probe timeout after no-op sets = %v, want unchanged %v", got, defaultDHTProbeTimeout)}})}