sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[management] run cancelPeerRoutinesWithoutLock in sync (#5234)

Browse Source
This commit is contained in:
Vlad
2026-02-01 15:44:27 +01:00
committed by GitHub
parent 7b830d8f72
commit 8931293343
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
management/internals/shared/grpc/server.go
View File

@@ -311,7 +311,7 @@ func (s *Server) Sync(req *proto.EncryptedMessage, srv proto.ManagementService_S
if err != nil { if err != nil {
log.WithContext(ctx).Debugf("error while sending initial sync for %s: %v", peerKey.String(), err) log.WithContext(ctx).Debugf("error while sending initial sync for %s: %v", peerKey.String(), err)
s.syncSem.Add(-1) s.syncSem.Add(-1)
s.cancelPeerRoutines(ctx, accountID, peer) s.cancelPeerRoutinesWithoutLock(ctx, accountID, peer)
return err return err
} }
@@ -319,7 +319,7 @@ func (s *Server) Sync(req *proto.EncryptedMessage, srv proto.ManagementService_S
if err != nil { if err != nil {
log.WithContext(ctx).Debugf("error while notify peer connected for %s: %v", peerKey.String(), err) log.WithContext(ctx).Debugf("error while notify peer connected for %s: %v", peerKey.String(), err)
s.syncSem.Add(-1) s.syncSem.Add(-1)
s.cancelPeerRoutines(ctx, accountID, peer) s.cancelPeerRoutinesWithoutLock(ctx, accountID, peer)
return err return err
} }
@@ -490,6 +490,10 @@ func (s *Server) cancelPeerRoutines(ctx context.Context, accountID string, peer
unlock := s.acquirePeerLockByUID(ctx, peer.Key) unlock := s.acquirePeerLockByUID(ctx, peer.Key)
defer unlock() defer unlock()
s.cancelPeerRoutinesWithoutLock(ctx, accountID, peer)
}
func (s *Server) cancelPeerRoutinesWithoutLock(ctx context.Context, accountID string, peer *nbpeer.Peer) {
err := s.accountManager.OnPeerDisconnected(ctx, accountID, peer.Key) err := s.accountManager.OnPeerDisconnected(ctx, accountID, peer.Key)
if err != nil { if err != nil {
log.WithContext(ctx).Errorf("failed to disconnect peer %s properly: %v", peer.Key, err) log.WithContext(ctx).Errorf("failed to disconnect peer %s properly: %v", peer.Key, err)