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

Lower retry interval on dns resolve failure (#2176)

Browse Source
This commit is contained in:
Viktor Liu 2024-06-24 11:55:07 +02:00 committed by GitHub
parent eaa31c2dc6
commit 628673db20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/internal/routemanager/dynamic/route.go
View File

@ -23,7 +23,8 @@ import (
const ( const (
DefaultInterval = time.Minute DefaultInterval = time.Minute
minInterval = 2 * time.Second minInterval = 2 * time.Second
failureInterval = 5 * time.Second
addAllowedIP = "add allowed IP %s: %w" addAllowedIP = "add allowed IP %s: %w"
) )
@ -160,7 +161,12 @@ func (r *Route) startResolver(ctx context.Context) {
ticker := time.NewTicker(interval) ticker := time.NewTicker(interval)
defer ticker.Stop() defer ticker.Stop()
r.update(ctx) if err := r.update(ctx); err != nil {
log.Errorf("Failed to resolve domains for route [%v]: %v", r, err)
if interval > failureInterval {
ticker.Reset(failureInterval)
}
}
for { for {
select { select {
@ -168,17 +174,28 @@ func (r *Route) startResolver(ctx context.Context) {
log.Debugf("Stopping dynamic route resolver for domains [%v]", r) log.Debugf("Stopping dynamic route resolver for domains [%v]", r)
return return
case <-ticker.C: case <-ticker.C:
r.update(ctx) if err := r.update(ctx); err != nil {
log.Errorf("Failed to resolve domains for route [%v]: %v", r, err)
// Use a lower ticker interval if the update fails
if interval > failureInterval {
ticker.Reset(failureInterval)
}
} else if interval > failureInterval {
// Reset to the original interval if the update succeeds
ticker.Reset(interval)
}
} }
} }
} }
func (r *Route) update(ctx context.Context) { func (r *Route) update(ctx context.Context) error {
if resolved, err := r.resolveDomains(); err != nil { if resolved, err := r.resolveDomains(); err != nil {
log.Errorf("Failed to resolve domains for route [%v]: %v", r, err) return fmt.Errorf("resolve domains: %w", err)
} else if err := r.updateDynamicRoutes(ctx, resolved); err != nil { } else if err := r.updateDynamicRoutes(ctx, resolved); err != nil {
log.Errorf("Failed to update dynamic routes for [%v]: %v", r, err) return fmt.Errorf("update dynamic routes: %w", err)
} }
return nil
} }
func (r *Route) resolveDomains() (domainMap, error) { func (r *Route) resolveDomains() (domainMap, error) {