mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-13 00:49:07 +02:00
Move the foreign-relay client cache out of Manager into a foreignRelays type. Concurrent first-time connects to the same server are deduplicated with singleflight, so the cache mutex is never held during a network connect (removing the previous stall where a slow connect blocked all map operations). A per-entry in-use refcount prevents the cleanup loop from closing a client while a connection is being opened on it. This drops RelayTrack, its per-track lock and the hand-over-hand locking between the map lock and the track lock. The exported API is unchanged.
157 lines
3.6 KiB
Go
157 lines
3.6 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/netip"
|
|
"sync"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"golang.org/x/sync/singleflight"
|
|
|
|
relayAuth "github.com/netbirdio/netbird/shared/relay/auth/hmac"
|
|
)
|
|
|
|
type foreignRelay struct {
|
|
client *Client
|
|
created time.Time
|
|
inUse int
|
|
}
|
|
|
|
type foreignRelays struct {
|
|
mu sync.RWMutex
|
|
clients map[string]*foreignRelay
|
|
|
|
group singleflight.Group
|
|
|
|
ctx context.Context
|
|
tokenStore *relayAuth.TokenStore
|
|
peerID string
|
|
mtu uint16
|
|
transportFallback *transportFallback
|
|
onDisconnect func(string)
|
|
keepUnusedServerTime time.Duration
|
|
}
|
|
|
|
func newForeignRelays(ctx context.Context, tokenStore *relayAuth.TokenStore, peerID string, mtu uint16, transportFallback *transportFallback, onDisconnect func(string), keepUnusedServerTime time.Duration) *foreignRelays {
|
|
return &foreignRelays{
|
|
clients: make(map[string]*foreignRelay),
|
|
ctx: ctx,
|
|
tokenStore: tokenStore,
|
|
peerID: peerID,
|
|
mtu: mtu,
|
|
transportFallback: transportFallback,
|
|
onDisconnect: onDisconnect,
|
|
keepUnusedServerTime: keepUnusedServerTime,
|
|
}
|
|
}
|
|
|
|
func (f *foreignRelays) openConn(ctx context.Context, serverAddress, peerKey string, serverIP netip.Addr) (net.Conn, error) {
|
|
fr, err := f.acquire(serverAddress, serverIP)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer f.release(fr)
|
|
|
|
return fr.client.OpenConn(ctx, peerKey)
|
|
}
|
|
|
|
func (f *foreignRelays) acquire(serverAddress string, serverIP netip.Addr) (*foreignRelay, error) {
|
|
f.mu.Lock()
|
|
if fr, ok := f.clients[serverAddress]; ok {
|
|
fr.inUse++
|
|
f.mu.Unlock()
|
|
return fr, nil
|
|
}
|
|
f.mu.Unlock()
|
|
|
|
v, err, _ := f.group.Do(serverAddress, func() (any, error) {
|
|
f.mu.RLock()
|
|
fr, ok := f.clients[serverAddress]
|
|
f.mu.RUnlock()
|
|
if ok {
|
|
return fr, nil
|
|
}
|
|
|
|
relayClient := NewClientWithServerIP(serverAddress, serverIP, f.tokenStore, f.peerID, f.mtu)
|
|
relayClient.SetTransportFallback(f.transportFallback)
|
|
if err := relayClient.Connect(f.ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
relayClient.SetOnDisconnectListener(f.onDisconnect)
|
|
|
|
f.mu.Lock()
|
|
fr = &foreignRelay{client: relayClient, created: time.Now()}
|
|
f.clients[serverAddress] = fr
|
|
f.mu.Unlock()
|
|
return fr, nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
fr := v.(*foreignRelay)
|
|
f.mu.Lock()
|
|
if cur, ok := f.clients[serverAddress]; !ok || cur != fr {
|
|
f.mu.Unlock()
|
|
return f.acquire(serverAddress, serverIP)
|
|
}
|
|
fr.inUse++
|
|
f.mu.Unlock()
|
|
return fr, nil
|
|
}
|
|
|
|
func (f *foreignRelays) release(fr *foreignRelay) {
|
|
f.mu.Lock()
|
|
fr.inUse--
|
|
f.mu.Unlock()
|
|
}
|
|
|
|
func (f *foreignRelays) evict(serverAddress string) {
|
|
f.mu.Lock()
|
|
defer f.mu.Unlock()
|
|
if _, ok := f.clients[serverAddress]; ok {
|
|
delete(f.clients, serverAddress)
|
|
log.Debugf("evicted disconnected foreign relay client: %s", serverAddress)
|
|
}
|
|
}
|
|
|
|
func (f *foreignRelays) cleanupUnused() {
|
|
f.mu.Lock()
|
|
defer f.mu.Unlock()
|
|
|
|
for addr, fr := range f.clients {
|
|
if time.Since(fr.created) <= f.keepUnusedServerTime {
|
|
continue
|
|
}
|
|
if fr.inUse > 0 {
|
|
continue
|
|
}
|
|
if fr.client.HasConns() {
|
|
continue
|
|
}
|
|
fr.client.SetOnDisconnectListener(nil)
|
|
go func() {
|
|
_ = fr.client.Close()
|
|
}()
|
|
log.Debugf("clean up unused relay server connection: %s", addr)
|
|
delete(f.clients, addr)
|
|
}
|
|
}
|
|
|
|
func (f *foreignRelays) states() []RelayConnState {
|
|
f.mu.RLock()
|
|
clients := make([]*Client, 0, len(f.clients))
|
|
for _, fr := range f.clients {
|
|
clients = append(clients, fr.client)
|
|
}
|
|
f.mu.RUnlock()
|
|
|
|
states := make([]RelayConnState, 0, len(clients))
|
|
for _, c := range clients {
|
|
states = append(states, relayConnState(c))
|
|
}
|
|
return states
|
|
}
|