extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-01-08 15:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix guard handling

Browse Source
This commit is contained in:
Zoltán Papp 2024-10-29 10:59:04 +01:00
parent 7bde2ac09c
commit 8f391b3ec1
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
relay/client/guard.go
View File

@ -38,10 +38,15 @@ func NewGuard(sp *ServerPicker) *Guard {
// - relayClient: The relay client instance that was disconnected. // - relayClient: The relay client instance that was disconnected.
// todo prevent multiple reconnection instances. In the current usage it should not happen, but it is better to prevent // todo prevent multiple reconnection instances. In the current usage it should not happen, but it is better to prevent
func (g *Guard) StartReconnectTrys(ctx context.Context, relayClient *Client) { func (g *Guard) StartReconnectTrys(ctx context.Context, relayClient *Client) {
if relayClient == nil {
goto RETRY
}
if g.isServerURLStillValid(relayClient) && g.quickReconnect(ctx, relayClient) { if g.isServerURLStillValid(relayClient) && g.quickReconnect(ctx, relayClient) {
return return
} }
RETRY:
// todo use exponent ticker
ticker := time.NewTicker(reconnectingTimeout) ticker := time.NewTicker(reconnectingTimeout)
defer ticker.Stop() defer ticker.Stop()
@ -60,6 +65,7 @@ func (g *Guard) StartReconnectTrys(ctx context.Context, relayClient *Client) {
} }
func (g *Guard) retry(ctx context.Context) error { func (g *Guard) retry(ctx context.Context) error {
log.Infof("try to pick up a new Relay server")
relayClient, err := g.serverPicker.PickServer(ctx) relayClient, err := g.serverPicker.PickServer(ctx)
if err != nil { if err != nil {
return err return err
@ -80,6 +86,7 @@ func (g *Guard) quickReconnect(parentCtx context.Context, rc *Client) bool {
if parentCtx.Err() != nil { if parentCtx.Err() != nil {
return false return false
} }
log.Infof("try to reconnect to Relay server: %s", rc.connectionURL)
if err := rc.Connect(); err != nil { if err := rc.Connect(); err != nil {
log.Errorf("failed to reconnect to relay server: %s", err) log.Errorf("failed to reconnect to relay server: %s", err)

9
relay/client/manager.go
View File

@ -89,6 +89,7 @@ func NewManager(ctx context.Context, serverURLs []string, peerID string) *Manage
onDisconnectedListeners: make(map[string]*list.List), onDisconnectedListeners: make(map[string]*list.List),
} }
m.serverPicker.ServerURLs.Store(serverURLs) m.serverPicker.ServerURLs.Store(serverURLs)
m.reconnectGuard = NewGuard(m.serverPicker)
return m return m
} }
@ -103,14 +104,14 @@ func (m *Manager) Serve() error {
m.running = true m.running = true
log.Debugf("starting relay client manager with %v relay servers", m.serverPicker.ServerURLs.Load()) log.Debugf("starting relay client manager with %v relay servers", m.serverPicker.ServerURLs.Load())
m.reconnectGuard = NewGuard(m.serverPicker)
go m.listenGuardEvent(m.ctx)
client, err := m.serverPicker.PickServer(m.ctx) client, err := m.serverPicker.PickServer(m.ctx)
if err == nil { if err != nil {
m.reconnectGuard.StartReconnectTrys(m.ctx, nil)
} else {
m.storeClient(client) m.storeClient(client)
} }
go m.listenGuardEvent(m.ctx)
go m.startCleanupLoop() go m.startCleanupLoop()
return err return err
} }

2
relay/client/picker.go
View File

@ -80,7 +80,7 @@ func (sp *ServerPicker) processConnResults(resultChan chan connResult, successCh
for numOfResults := 0; numOfResults < cap(resultChan); numOfResults++ { for numOfResults := 0; numOfResults < cap(resultChan); numOfResults++ {
cr := <-resultChan cr := <-resultChan
if cr.Err != nil { if cr.Err != nil {
log.Debugf("failed to connect to Relay server: %s: %v", cr.Url, cr.Err) log.Tracef("failed to connect to Relay server: %s: %v", cr.Url, cr.Err)
continue continue
} }
log.Infof("connected to Relay server: %s", cr.Url) log.Infof("connected to Relay server: %s", cr.Url)