gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-16 19:14:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

[fixed] jetstream unique server name requirement across domains (#2378)

Browse Source 
* [fixed] jetstream unique server name requirement across domains

including domain in server info
adding check for cluster name in duplicate leaf node connection check

This does not address non unique domains in the same domain, say within
super cluster.

Signed-off-by: Matthias Hanel <mh@synadia.com>
This commit is contained in:
Matthias Hanel
2021-07-27 18:42:19 -04:00
committed by GitHub
parent 7c07b4e46d
commit a40ea298e5
5 changed files with 140 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/leafnode.go
View File

@@ -1198,7 +1198,7 @@ func (s *Server) setLeafNodeInfoHostPortAndIP() error {
// (this solves the stale connection situation). An error is returned to help the
// remote detect the misconfiguration when the duplicate is the result of that
// misconfiguration.
func (s *Server) addLeafNodeConnection(c *client, srvName string, checkForDup bool) {
func (s *Server) addLeafNodeConnection(c *client, srvName, clusterName string, checkForDup bool) {
var accName string
c.mu.Lock()
cid := c.cid
@@ -1217,7 +1217,8 @@ func (s *Server) addLeafNodeConnection(c *client, srvName string, checkForDup bo
// is more about replacing stale connections than detecting loops.
// We have code for the loop detection elsewhere, which also delays
// attempt to reconnect.
if !ol.isSolicitedLeafNode() && ol.leaf.remoteServer == srvName && ol.acc.Name == accName {
if !ol.isSolicitedLeafNode() && ol.leaf.remoteServer == srvName &&
ol.leaf.remoteCluster == clusterName && ol.acc.Name == accName {
old = ol
}
ol.mu.Unlock()
@@ -1350,7 +1351,7 @@ func (c *client) processLeafNodeConnect(s *Server, arg []byte, lang string) erro
c.mu.Unlock()
// Add in the leafnode here since we passed through auth at this point.
s.addLeafNodeConnection(c, proto.Name, true)
s.addLeafNodeConnection(c, proto.Name, proto.Cluster, true)
// If we have permissions bound to this leafnode we need to send then back to the
// origin server for local enforcement.
@@ -2440,7 +2441,7 @@ func (s *Server) leafNodeFinishConnectProcess(c *client) {
// Make sure we register with the account here.
c.registerWithAccount(acc)
s.addLeafNodeConnection(c, _EMPTY_, false)
s.addLeafNodeConnection(c, _EMPTY_, _EMPTY_, false)
s.initLeafNodeSmapAndSendSubs(c)
if sendSysConnectEvent {
s.sendLeafNodeConnect(acc)