github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

better fix 

Signed-off-by: acpana <8968914+acpana@users.noreply.github.com>
pull/13929/head
acpana 2022-07-27 14:28:08 -07:00
parent 8b2ef80336
commit 0351ca5136
No known key found for this signature in database
GPG Key ID: 21CC0F2B42CEA01D
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
agent/rpc/peering/service.go
View File

@ -346,7 +346,7 @@ func (s *Server) Establish(
return nil, err
}
if err := s.validatePeeringInPartition(tok.PeerID, entMeta.PartitionOrDefault()); err != nil {
if err := s.validatePeeringInPartition(tok.PeerID, entMeta.PartitionOrEmpty()); err != nil {
return nil, err
}
@ -408,16 +408,9 @@ func (s *Server) validatePeeringInPartition(remotePeerID, partition string) erro
return fmt.Errorf("cannot read peering by ID: %w", err)
}
if peering != nil {
stateStorePart := peering.Partition
if stateStorePart == "" {
stateStorePart = "default"
}
if stateStorePart == partition {
if peering != nil && peering.GetPartition() == partition {
return fmt.Errorf("cannot create a peering within the same partition (ENT) or cluster (OSS)")
}
}
return nil
}