Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Exclude unconditional peers when connection limit checking #245

Merged
merged 1 commit into from
Oct 18, 2024
Merged

feat: Exclude unconditional peers when connection limit checking #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/p2p/peermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
if m.options.MaxConnected > 0 && m.NumConnected() >= int(m.options.MaxConnected) {
if upgradeFromPeer == "" || m.NumConnected() >=
int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
return fmt.Errorf("already connected to maximum number of peers")
return fmt.Errorf("dialed peer %q failed, is already connected to maximum number of peers", address.NodeID)
}
}

Expand Down Expand Up @@ -724,9 +724,9 @@ func (m *PeerManager) Accepted(peerID types.NodeID) error {
dupeConnectionErr := fmt.Errorf("can't accept, peer=%q is already connected", peerID)
return dupeConnectionErr
}
if m.options.MaxConnected > 0 &&
if !m.options.isUnconditional(peerID) && m.options.MaxConnected > 0 &&
m.NumConnected() >= int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
return fmt.Errorf("already connected to maximum number of peers")
return fmt.Errorf("accepted peer %q failed, already connected to maximum number of peers", peerID)
}

peer, ok := m.store.Get(peerID)
Expand All @@ -746,7 +746,7 @@ func (m *PeerManager) Accepted(peerID types.NodeID) error {
if m.options.MaxConnected > 0 && m.NumConnected() >= int(m.options.MaxConnected) {
upgradeFromPeer = m.findUpgradeCandidate(peer.ID, peer.Score())
if upgradeFromPeer == "" {
return fmt.Errorf("already connected to maximum number of peers")
return fmt.Errorf("upgrade peer %q failed, already connected to maximum number of peers", peer.ID)
}
}

Expand Down
Loading