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

[client] Refactor lastNetworkMapSerial handling in GrpcClient

Browse Source 
- Removed atomic operations for lastNetworkMapSerial and replaced them with mutex-based methods for thread-safe access.
This commit is contained in:
Hakan Sariman
2025-09-29 18:49:23 +07:00
parent d0c65fa08e
commit fc141cf3a3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shared/management/client/grpc.go
View File

@@ -6,7 +6,6 @@ import (
"fmt" "fmt"
"io" "io"
"sync" "sync"
"sync/atomic"
"time" "time"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
@@ -47,6 +46,7 @@ type GrpcClient struct {
connStateCallbackLock sync.RWMutex connStateCallbackLock sync.RWMutex
// lastNetworkMapSerial stores last seen network map serial to optimize sync // lastNetworkMapSerial stores last seen network map serial to optimize sync
lastNetworkMapSerial uint64 lastNetworkMapSerial uint64
lastNetworkMapSerialMu sync.Mutex
} }
// NewClient creates a new client to Management service // NewClient creates a new client to Management service
@@ -220,7 +220,7 @@ func (c *GrpcClient) GetNetworkMap(sysInfo *system.Info) (*proto.NetworkMap, err
} }
// update last seen serial // update last seen serial
atomic.StoreUint64(&c.lastNetworkMapSerial, decryptedResp.GetNetworkMap().GetSerial()) c.setLastNetworkMapSerial(decryptedResp.GetNetworkMap().GetSerial())
return decryptedResp.GetNetworkMap(), nil return decryptedResp.GetNetworkMap(), nil
} }
@@ -235,7 +235,7 @@ func (c *GrpcClient) connectToStream(ctx context.Context, serverPubKey wgtypes.K
recomputed.Files = sysInfo.Files recomputed.Files = sysInfo.Files
} }
} }
req := &proto.SyncRequest{Meta: infoToMetaData(recomputed), NetworkMapSerial: atomic.LoadUint64(&c.lastNetworkMapSerial)} req := &proto.SyncRequest{Meta: infoToMetaData(recomputed), NetworkMapSerial: c.getLastNetworkMapSerial()}
myPrivateKey := c.key myPrivateKey := c.key
myPublicKey := myPrivateKey.PublicKey() myPublicKey := myPrivateKey.PublicKey()
@@ -275,7 +275,7 @@ func (c *GrpcClient) receiveEvents(stream proto.ManagementService_SyncClient, se
// track latest network map serial if present // track latest network map serial if present
if decryptedResp.GetNetworkMap() != nil { if decryptedResp.GetNetworkMap() != nil {
atomic.StoreUint64(&c.lastNetworkMapSerial, decryptedResp.GetNetworkMap().GetSerial()) c.setLastNetworkMapSerial(decryptedResp.GetNetworkMap().GetSerial())
} }
if err := msgHandler(decryptedResp); err != nil { if err := msgHandler(decryptedResp); err != nil {
@@ -602,3 +602,18 @@ func infoToMetaData(info *system.Info) *proto.PeerSystemMeta {
}, },
} }
} }
// setLastNetworkMapSerial updates the cached last seen network map serial in a 32-bit safe manner
func (c *GrpcClient) setLastNetworkMapSerial(serial uint64) {
c.lastNetworkMapSerialMu.Lock()
c.lastNetworkMapSerial = serial
c.lastNetworkMapSerialMu.Unlock()
}
// getLastNetworkMapSerial returns the cached last seen network map serial in a 32-bit safe manner
func (c *GrpcClient) getLastNetworkMapSerial() uint64 {
c.lastNetworkMapSerialMu.Lock()
v := c.lastNetworkMapSerial
c.lastNetworkMapSerialMu.Unlock()
return v
}