sync w ent
Signed-off-by: acpana <8968914+acpana@users.noreply.github.com>
This commit is contained in:
parent
213e985d17
commit
b03467e3bd
|
@ -346,8 +346,7 @@ func (s *Server) Establish(
|
|||
return nil, err
|
||||
}
|
||||
|
||||
// we don't want to default req.Partition unlike because partitions are empty in OSS
|
||||
if err := s.validatePeeringInPartition(tok.PeerID, req.Partition); err != nil {
|
||||
if err := s.validatePeeringInPartition(tok.PeerID, entMeta.PartitionOrDefault()); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
@ -409,9 +408,16 @@ func (s *Server) validatePeeringInPartition(remotePeerID, partition string) erro
|
|||
return fmt.Errorf("cannot read peering by ID: %w", err)
|
||||
}
|
||||
|
||||
if peering != nil && peering.Partition == partition {
|
||||
if peering != nil {
|
||||
stateStorePart := peering.Partition
|
||||
if stateStorePart == "" {
|
||||
stateStorePart = "default"
|
||||
}
|
||||
|
||||
if stateStorePart == partition {
|
||||
return fmt.Errorf("cannot create a peering within the same partition (ENT) or cluster (OSS)")
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue