sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-25 11:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade cache logic in sync fast path to handle legacy entries and avoid corrupting HasUser flag.

Browse Source
This commit is contained in:
mlsmaycon
2026-04-24 17:35:33 +02:00
parent cf7081e592
commit ac6b73005d
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
management/internals/shared/grpc/sync_fast_path.go
View File

@@ -242,7 +242,14 @@ func (s *Server) tryFastPathSync(
return false, nil return false, nil
} }
return true, s.runFastPathSync(ctx, reqStart, syncStart, accountID, peerKey, peer, updates, cached.Serial, peerMetaHash, srv, unlock) // Upgrade the cache only when we had to fetch the peer from the store
// this Sync. In the steady state the cached snapshot lacks UserID (not
// part of PeerSnapshot), so rewriting from it would flip HasUser to
// false and corrupt the entry. A cache-served peer also means the
// entry is already in the full shape, so there's nothing to upgrade.
upgradeCache := cachedPeer == nil
return true, s.runFastPathSync(ctx, reqStart, syncStart, accountID, peerKey, peer, updates, cached.Serial, peerMetaHash, upgradeCache, srv, unlock)
} }
// commitFastPath subscribes the peer to network-map updates and marks it // commitFastPath subscribes the peer to network-map updates and marks it
@@ -315,6 +322,7 @@ func (s *Server) runFastPathSync(
updates chan *network_map.UpdateMessage, updates chan *network_map.UpdateMessage,
serial uint64, serial uint64,
peerMetaHash uint64, peerMetaHash uint64,
upgradeCache bool,
srv proto.ManagementService_SyncServer, srv proto.ManagementService_SyncServer,
unlock *func(), unlock *func(),
) error { ) error {
@@ -327,12 +335,15 @@ func (s *Server) runFastPathSync(
} }
log.WithContext(ctx).Debugf("fast path: sendFastPathResponse took %s", time.Since(sendStart)) log.WithContext(ctx).Debugf("fast path: sendFastPathResponse took %s", time.Since(sendStart))
// Refresh the cache entry in the new shape. For peers whose cache entry // Upgrade a legacy-shape cache entry (Serial + MetaHash only, pre step 2)
// was written by pre-step-2 code (Serial + MetaHash only), this upgrades // to the full shape so the next Sync's lookupPeerAuthFromCache +
// them to the full shape so the next Sync's lookupPeerAuthFromCache + // commitFastPath can actually short-circuit the pre-fast-path
// commitFastPath can actually short-circuit GetPeerAuthInfo and // GetPeerAuthInfo and GetPeerByPeerPubKey. Only runs when the peer was
// GetPeerByPeerPubKey. Idempotent when the entry is already complete. // freshly fetched from the store this Sync — rewriting from a cached
// snapshot would lose HasUser because PeerSnapshot doesn't carry UserID.
if upgradeCache {
s.writePeerSyncEntry(peerKey.String(), serial, peerMetaHash, peer) s.writePeerSyncEntry(peerKey.String(), serial, peerMetaHash, peer)
}
s.secretsManager.SetupRefresh(ctx, accountID, peer.ID) s.secretsManager.SetupRefresh(ctx, accountID, peer.ID)