sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-01 12:31:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add enhanced logging for account peer updates and debugging

Browse Source
This commit is contained in:
mlsmaycon
2026-06-23 13:04:41 +02:00
parent 51b6f6291b
commit 49c8d571b2
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
management/internals/controllers/network_map/controller/controller.go
View File

@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"os"
"runtime/debug"
"slices"
"strconv"
"sync"
@@ -177,6 +178,10 @@ func (c *Controller) sendUpdateAccountPeers(ctx context.Context, accountID strin
return fmt.Errorf("failed to get account zones: %v", err)
}
if reason.Operation == types.UpdateOperationUpdate && reason.Resource == types.UpdateResourceUser {
log.WithContext(ctx).Tracef("got an user update, stack: %s", debug.Stack())
}
for _, peer := range account.Peers {
if !c.peersUpdateManager.HasChannel(peer.ID) {
log.WithContext(ctx).Tracef("peer %s doesn't have a channel, skipping network map update", peer.ID)
@@ -251,7 +256,7 @@ func (c *Controller) UpdateAffectedPeers(ctx context.Context, accountID string,
}
func (c *Controller) sendUpdateForAffectedPeers(ctx context.Context, accountID string, peerIDs []string) error {
log.WithContext(ctx).Tracef("sendUpdateForAffectedPeers: account %s, %d affected peers: %v (caller: %s)", accountID, len(peerIDs), peerIDs, util.GetCallerName())
log.WithContext(ctx).Tracef("sendUpdateForAffectedPeers: account %s, %d affected peers (caller: %s)", accountID, len(peerIDs), util.GetCallerName())
if !c.hasConnectedPeers(peerIDs) {
log.WithContext(ctx).Tracef("sendUpdateForAffectedPeers: no connected peers among %v, skipping", peerIDs)
@@ -497,7 +502,11 @@ func (c *Controller) BufferUpdateAffectedPeers(ctx context.Context, accountID st
c.accountManagerMetrics.CountUpdateAccountPeersTriggered(string(reason.Resource), string(reason.Operation))
}
log.WithContext(ctx).Tracef("buffer updating %d affected peers for account %s from %s", len(peerIDs), accountID, util.GetCallerName())
log.WithContext(ctx).Tracef("buffer updating %d affected peers for account %s from %s with reason %s/%s", len(peerIDs), accountID, util.GetCallerName(), reason.Operation, reason.Resource)
if reason.Operation == types.UpdateOperationUpdate && reason.Resource == types.UpdateResourceUser {
log.WithContext(ctx).Tracef("got an user update, stack: %s", debug.Stack())
}
bufUpd, _ := c.affectedPeerUpdateLocks.LoadOrStore(accountID, &bufferAffectedUpdate{
peerIDs: make(map[string]struct{}),

3
management/server/peer.go
View File

@@ -11,6 +11,7 @@ import (
"strings"
"time"
"github.com/netbirdio/netbird/util"
"github.com/rs/xid"
log "github.com/sirupsen/logrus"
"golang.org/x/exp/maps"
@@ -1477,6 +1478,7 @@ func (am *DefaultAccountManager) GetPeer(ctx context.Context, accountID, peerID,
// UpdateAccountPeers updates all peers that belong to an account.
// Should be called when changes have to be synced to peers.
func (am *DefaultAccountManager) UpdateAccountPeers(ctx context.Context, accountID string, reason types.UpdateReason) {
log.WithContext(ctx).Tracef("update account peers for account %s from caller: %s with reason %s/%s", accountID, util.GetCallerName(), reason.Operation, reason.Resource)
_ = am.networkMapController.UpdateAccountPeers(ctx, accountID, reason)
}
@@ -1575,6 +1577,7 @@ func (am *DefaultAccountManager) resolveAffectedPeersForPeerChanges(ctx context.
}
func (am *DefaultAccountManager) BufferUpdateAccountPeers(ctx context.Context, accountID string, reason types.UpdateReason) {
log.WithContext(ctx).Tracef("buffering update account peers for account %s from caller: %s with reason %s/%s", accountID, util.GetCallerName(), reason.Operation, reason.Resource)
_ = am.networkMapController.BufferUpdateAccountPeers(ctx, accountID, reason)
}