Merge pull request #2695 from openziti/rdm-always-in-ha

Always use RDM when there are multiple controllers. Fixes #2694

CHANGELOG.md

@@ -1,3 +1,15 @@
+# Release 1.3.3
+
+# What's New
+
+* Bug Fixes
+
+## Component Updates and Bug Fixes
+
+* github.com/openziti/ziti: [v1.3.2 -> v1.3.3](https://github.com/openziti/ziti/compare/v1.3.2...v1.3.3)
+    * [Issue #2694](https://github.com/openziti/ziti/issues/2694) - Router should use router data model if it has more than one controller configured, regardless of controller configuration
+
+
 # Release 1.3.2
 
 # What's New

router/env/ctrls.go

@@ -27,6 +27,7 @@ import (
 	cmap "github.com/orcaman/concurrent-map/v2"
 	"github.com/pkg/errors"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/openziti/channel/v3"
@@ -74,6 +75,7 @@ type NetworkControllers interface {
 	Inspect() *inspect.ControllerInspectDetails
 	AddChangeListener(listener CtrlEventListener)
 	NotifyOfReconnect(ctrlId string)
+	GetExpectedCtrlCount() uint32
 }
 
 type CtrlDialer func(address transport.Address, bindHandler channel.BindHandler) error
@@ -96,16 +98,22 @@ type networkControllers struct {
 	ctrls                 concurrenz.CopyOnWriteMap[string, NetworkController]
 	leaderId              concurrenz.AtomicValue[string]
 	ctrlChangeListeners   concurrenz.CopyOnWriteSlice[CtrlEventListener]
+	expectedCtrlCount     atomic.Uint32
 }
 
 func (self *networkControllers) AddChangeListener(listener CtrlEventListener) {
 	self.ctrlChangeListeners.Append(listener)
 }
 
+func (self *networkControllers) GetExpectedCtrlCount() uint32 {
+	return self.expectedCtrlCount.Load()
+}
+
 func (self *networkControllers) UpdateControllerEndpoints(addresses []string) bool {
 	self.lock.Lock()
 	defer self.lock.Unlock()
 
+	self.expectedCtrlCount.Store(uint32(len(addresses)))
 	changed := false
 
 	log := pfxlog.Logger()

router/handler_ctrl/bind.go

@@ -120,7 +120,11 @@ func (self *bindHandler) BindChannel(binding channel.Binding) error {
 	}
 
 	enableRouterDataModel := capabilities.IsCapable(binding.GetChannel(), capabilities.RouterDataModel)
-	self.env.GetRouterDataModelEnabledConfig().Store(enableRouterDataModel)
+	if self.env.GetNetworkControllers().GetExpectedCtrlCount() < 2 {
+		self.env.GetRouterDataModelEnabledConfig().Store(enableRouterDataModel)
+	} else {
+		self.env.GetRouterDataModelEnabledConfig().Store(true)
+	}
 
 	return nil
 }