Remove routing.recursionBlockDuration and routing.recursionBlockTreads

The rapid-reconnect recursion-block logic in stream_creator.go and the
associated config settings are removed. The struct fields are kept for
backward-compatible YAML parsing but emit a deprecation warning pointing
to the route-controller DaemonSet. Test helpers that disabled the feature
via RecursionBlockDuration=0 are cleaned up accordingly.

Signed-off-by: Thomas Hallgren <thomas@tada.se>

Author: thallgren

integration_test/itest/cluster.go

@@ -459,7 +459,6 @@ func (s *cluster) withBasicConfig(c context.Context, t *testing.T) context.Conte
 	if s.ClientIsVersion(">=2.23.0") {
 		config.Intercept().MountsRoot = TempDir(c)
 	}
-	config.Routing().RecursionBlockDuration = 10 * time.Millisecond
 	config = config.Merge(client.GetConfig(c))
 
 	configYaml, err := config.MarshalYAML()

integration_test/large_files_test.go

@@ -197,10 +197,6 @@ func (s *largeFilesSuite) Test_LargeFileIntercepts_sshfs() {
 }
 
 func (s *largeFilesSuite) largeFileIntercepts(ctx context.Context) {
-	ctx = itest.WithConfig(ctx, func(config client.Config) {
-		config.Routing().RecursionBlockDuration = 0
-	})
-
 	s.createIntercepts(ctx)
 	wg := sync.WaitGroup{}
 

integration_test/multiple_services_test.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/telepresenceio/clog"
 	"github.com/telepresenceio/telepresence/v2/integration_test/itest"
-	"github.com/telepresenceio/telepresence/v2/pkg/client"
 )
 
 type multipleServicesSuite struct {
@@ -36,12 +35,8 @@ func (s *multipleServicesSuite) Test_LargeRequest() {
 	if !(s.ManagerIsVersion(">2.21.x") && s.ClientIsVersion(">2.21.x")) {
 		s.T().Skip("Not part of compatibility tests. TUN-device isn't stable enough in versions <2.22.0")
 	}
-	// This particular cannot run with recursion detection, because it will trigger on the very high concurrency.
 	ctx := s.Context()
 	itest.TelepresenceQuitOk(ctx)
-	ctx = itest.WithConfig(ctx, func(config client.Config) {
-		config.Routing().RecursionBlockDuration = 0
-	})
 	s.TelepresenceConnect(ctx)
 	defer func() {
 		// Restore the connection to what it was before the test.

integration_test/wiretap_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/telepresenceio/clog"
 	"github.com/telepresenceio/telepresence/rpc/v2/connector"
 	"github.com/telepresenceio/telepresence/v2/integration_test/itest"
-	"github.com/telepresenceio/telepresence/v2/pkg/client"
 )
 
 type wiretapSuite struct {
@@ -106,9 +105,7 @@ func (s *wiretapSuite) startWiretapHandler(ctx context.Context, name, addr strin
 }
 
 func (s *wiretapSuite) Test_MultipleTapsOnOnePort() { //nolint:gocognit
-	ctx := itest.WithConfig(s.Context(), func(config client.Config) {
-		config.Routing().RecursionBlockDuration = 0
-	})
+	ctx := s.Context()
 	s.TelepresenceConnect(ctx)
 	defer itest.TelepresenceQuitOk(ctx)
 

pkg/client/config.go

@@ -229,6 +229,10 @@ func ParseConfigYAML(ctx context.Context, path string, data []byte) (Config, err
 		}
 		cfg.Routing().VirtualSubnet = sn
 	}
+	if r := cfg.Routing(); r.RecursionBlockDuration > 0 || r.RecursionBlockTreads > 0 {
+		clog.Warnf(ctx, "routing.recursionBlockDuration and routing.recursionBlockTreads are deprecated and no longer used; "+
+			"use the route-controller DaemonSet instead (see docs/reference/route-controller.md)")
+	}
 	return cfg, nil
 }
 
@@ -991,31 +995,30 @@ func (d *Helm) UnmarshalJSONFrom(in *jsontext.Decoder) error {
 }
 
 type Routing struct {
-	Subnets                []netip.Prefix `json:"subnets,omitempty"`
-	AlsoProxy              []netip.Prefix `json:"alsoProxySubnets,omitempty"`
-	NeverProxy             []netip.Prefix `json:"neverProxySubnets,omitempty"`
-	AllowConflicting       []netip.Prefix `json:"allowConflictingSubnets,omitempty"`
-	RecursionBlockDuration time.Duration  `json:"recursionBlockDuration,omitempty,format:units"`
-	RecursionBlockTreads   int            `json:"recursionBlockTreads,omitempty"`
-	VirtualSubnet          netip.Prefix   `json:"virtualSubnet"`
-	AutoResolveConflicts   bool           `json:"autoResolveConflicts"`
-	UseTAP                 bool           `json:"useTAP"`
+	Subnets              []netip.Prefix `json:"subnets,omitempty"`
+	AlsoProxy            []netip.Prefix `json:"alsoProxySubnets,omitempty"`
+	NeverProxy           []netip.Prefix `json:"neverProxySubnets,omitempty"`
+	AllowConflicting     []netip.Prefix `json:"allowConflictingSubnets,omitempty"`
+	VirtualSubnet        netip.Prefix   `json:"virtualSubnet"`
+	AutoResolveConflicts bool           `json:"autoResolveConflicts"`
+	UseTAP               bool           `json:"useTAP"`
 
 	// For backward compatibility.
 	OldAlsoProxy        []netip.Prefix `json:"alsoProxy,omitempty"`
 	OldNeverProxy       []netip.Prefix `json:"neverProxy,omitempty"`
 	OldAllowConflicting []netip.Prefix `json:"allowConflicting,omitempty"`
+
+	// Deprecated: no longer used. Use the route-controller DaemonSet instead.
+	RecursionBlockDuration time.Duration `json:"recursionBlockDuration,omitempty,format:units"`
+	// Deprecated: no longer used. Use the route-controller DaemonSet instead.
+	RecursionBlockTreads int `json:"recursionBlockTreads,omitempty"`
 }
 
-const (
-	defaultAutoResolveConflicts  = true
-	defaultRecursionBlockThreads = 5
-)
+const defaultAutoResolveConflicts = true
 
 var defaultRouting = Routing{ //nolint:gochecknoglobals // constant
 	VirtualSubnet:        defaultVirtualSubnet,
 	AutoResolveConflicts: defaultAutoResolveConflicts,
-	RecursionBlockTreads: defaultRecursionBlockThreads,
 }
 
 func (r *Routing) defaults() DefaultsAware {
@@ -1041,12 +1044,6 @@ func (r *Routing) merge(o *Routing) {
 	if len(o.Subnets) > 0 {
 		r.Subnets = o.Subnets
 	}
-	if o.RecursionBlockDuration > 0 {
-		r.RecursionBlockDuration = o.RecursionBlockDuration
-	}
-	if o.RecursionBlockTreads != defaultRecursionBlockThreads {
-		r.RecursionBlockTreads = o.RecursionBlockTreads
-	}
 	if o.VirtualSubnet != defaultVirtualSubnet {
 		r.VirtualSubnet = o.VirtualSubnet
 	}
@@ -1230,15 +1227,13 @@ func LoadConfig(c context.Context) (cfg Config, err error) {
 
 // RoutingSnake is the same as Routing but with snake_case json/yaml names.
 type RoutingSnake struct {
-	Subnets                []netip.Prefix `json:"subnets"`
-	AlsoProxy              []netip.Prefix `json:"also_proxy_subnets"`
-	NeverProxy             []netip.Prefix `json:"never_proxy_subnets"`
-	AllowConflicting       []netip.Prefix `json:"allow_conflicting_subnets"`
-	RecursionBlockDuration time.Duration  `json:"recursion_block_duration,format:units"`
-	RecursionBlockTreads   int            `json:"recursion_block_treads"`
-	VirtualSubnet          netip.Prefix   `json:"virtual_subnet"`
-	AutoResolveConflicts   bool           `json:"auto_resolve_conflicts"`
-	UseTAP                 bool           `json:"use_tap"`
+	Subnets              []netip.Prefix `json:"subnets"`
+	AlsoProxy            []netip.Prefix `json:"also_proxy_subnets"`
+	NeverProxy           []netip.Prefix `json:"never_proxy_subnets"`
+	AllowConflicting     []netip.Prefix `json:"allow_conflicting_subnets"`
+	VirtualSubnet        netip.Prefix   `json:"virtual_subnet"`
+	AutoResolveConflicts bool           `json:"auto_resolve_conflicts"`
+	UseTAP               bool           `json:"use_tap"`
 }
 
 // DNSMapping contains a hostname and its associated alias. When requesting the name, the intended behavior is
@@ -1371,15 +1366,13 @@ func MappingsFromRPC(mappings []*daemon.DNSMapping) DNSMappings {
 
 func (r *Routing) ToSnake() *RoutingSnake {
 	return &RoutingSnake{
-		Subnets:                r.Subnets,
-		AlsoProxy:              r.AlsoProxy,
-		NeverProxy:             r.NeverProxy,
-		AllowConflicting:       r.AllowConflicting,
-		AutoResolveConflicts:   r.AutoResolveConflicts,
-		RecursionBlockDuration: r.RecursionBlockDuration,
-		RecursionBlockTreads:   r.RecursionBlockTreads,
-		VirtualSubnet:          r.VirtualSubnet,
-		UseTAP:                 r.UseTAP,
+		Subnets:              r.Subnets,
+		AlsoProxy:            r.AlsoProxy,
+		NeverProxy:           r.NeverProxy,
+		AllowConflicting:     r.AllowConflicting,
+		AutoResolveConflicts: r.AutoResolveConflicts,
+		VirtualSubnet:        r.VirtualSubnet,
+		UseTAP:               r.UseTAP,
 	}
 }
 

pkg/client/rootd/stream_creator.go

@@ -6,8 +6,6 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/puzpuzpuz/xsync/v4"
-
 	"github.com/telepresenceio/clog"
 	"github.com/telepresenceio/telepresence/v2/pkg/client"
 	"github.com/telepresenceio/telepresence/v2/pkg/tunnel"
@@ -30,21 +28,7 @@ func checkRecursion(p types.Proto, ip netip.Addr, sn netip.Prefix) (err error) {
 	return err
 }
 
-type recursiveBlock struct {
-	start time.Time
-	count int
-	timer *time.Timer
-}
-
 func (s *session) streamCreator() tunnel.StreamCreator {
-	var recursionBlockMap *xsync.Map[netip.AddrPort, recursiveBlock]
-	routing := client.GetConfig(s).Routing()
-	recursionBlockDuration := routing.RecursionBlockDuration
-	recursionBlockThreads := routing.RecursionBlockTreads
-	if recursionBlockDuration != 0 {
-		recursionBlockMap = xsync.NewMap[netip.AddrPort, recursiveBlock]()
-	}
-
 	return func(c context.Context, id tunnel.ConnID) (tunnel.Stream, error) {
 		p := id.Protocol()
 		srcIp := id.SourceAddr()
@@ -72,34 +56,6 @@ func (s *session) streamCreator() tunnel.StreamCreator {
 			id = tunnel.NewConnID(id.Protocol(), id.Source(), netip.AddrPortFrom(destAddr, mp))
 		}
 
-		if recursionBlockDuration > 0 {
-			dst := netip.AddrPortFrom(destAddr, id.DestinationPort())
-			block := false
-			recursionBlockMap.Compute(dst, func(v recursiveBlock, loaded bool) (recursiveBlock, xsync.ComputeOp) {
-				if loaded {
-					if time.Since(v.start) < recursionBlockDuration {
-						v.count++
-						if v.count < recursionBlockThreads {
-							return v, xsync.UpdateOp
-						}
-						block = true
-					}
-					v.timer.Stop()
-					return v, xsync.DeleteOp
-				}
-
-				// Ensure deletion in case it's only called once
-				v.timer = time.AfterFunc(recursionBlockDuration*3, func() {
-					recursionBlockMap.Delete(dst)
-				})
-				v.start = time.Now()
-				return v, xsync.UpdateOp
-			})
-			if block {
-				return nil, fmt.Errorf("refusing recursive dispatch to %s", dst)
-			}
-		}
-
 		var err error
 		var tp tunnel.Provider
 		if a, ok := s.getAgentVIP(destAddr); ok {