TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: reset the dialPlan only when the URL is unchanged

Browse Source 
Also, reset it in a few more places (e.g. logout, new blank profiles,
etc.) to avoid a few more cases where a pre-existing dialPlan can cause
a new Headscale server take 10+ seconds to connect.

Updates #11938

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: I3095173a5a3d9720507afe4452548491e9e45a3e
This commit is contained in:
Andrew Dunham 2024-04-30 15:09:12 -04:00
parent c47f9303b0
commit fe009c134e
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ipn/ipnlocal/local.go
View File

@ -4594,6 +4594,7 @@ func (b *LocalBackend) ResetForClientDisconnect() {
b.authURLSticky = "" b.authURLSticky = ""
b.authURLTime = time.Time{} b.authURLTime = time.Time{}
b.activeLogin = "" b.activeLogin = ""
b.resetDialPlan()
b.setAtomicValuesFromPrefsLocked(ipn.PrefsView{}) b.setAtomicValuesFromPrefsLocked(ipn.PrefsView{})
b.enterStateLockedOnEntry(ipn.Stopped, unlock) b.enterStateLockedOnEntry(ipn.Stopped, unlock)
} }
@ -4675,7 +4676,7 @@ func (b *LocalBackend) Logout(ctx context.Context) error {
// b.mu is now unlocked, after editPrefsLockedOnEntry. // b.mu is now unlocked, after editPrefsLockedOnEntry.
// Clear any previous dial plan(s), if set. // Clear any previous dial plan(s), if set.
b.dialPlan.Store(nil) b.resetDialPlan()
if cc == nil { if cc == nil {
// Double Logout can happen via repeated IPN // Double Logout can happen via repeated IPN
@ -5878,13 +5879,17 @@ func (b *LocalBackend) SwitchProfile(profile ipn.ProfileID) error {
unlock := b.lockAndGetUnlock() unlock := b.lockAndGetUnlock()
defer unlock() defer unlock()
oldControlURL := b.pm.CurrentPrefs().ControlURLOrDefault()
if err := b.pm.SwitchProfile(profile); err != nil { if err := b.pm.SwitchProfile(profile); err != nil {
return err return err
} }
// TODO: Check if serverUrl in the switched profile is actually changed; // As an optimization, only reset the dialPlan if the control URL
// if not, then no need to reset dial plan // changed; we treat an empty URL as "unknown" and always reset.
b.dialPlan.Store(nil) newControlURL := b.pm.CurrentPrefs().ControlURLOrDefault()
if oldControlURL != newControlURL || oldControlURL == "" || newControlURL == "" {
b.resetDialPlan()
}
return b.resetForProfileChangeLockedOnEntry(unlock) return b.resetForProfileChangeLockedOnEntry(unlock)
} }
@ -5936,6 +5941,17 @@ func (b *LocalBackend) initTKALocked() error {
return nil return nil
} }
// resetDialPlan resets the dialPlan for this LocalBackend. It will log if
// anything is reset.
//
// It is safe to call this concurrently, with or without b.mu held.
func (b *LocalBackend) resetDialPlan() {
old := b.dialPlan.Swap(nil)
if old != nil {
b.logf("resetDialPlan: did reset")
}
}
// resetForProfileChangeLockedOnEntry resets the backend for a profile change. // resetForProfileChangeLockedOnEntry resets the backend for a profile change.
// //
// b.mu must held on entry. It is released on exit. // b.mu must held on entry. It is released on exit.
@ -5994,6 +6010,11 @@ func (b *LocalBackend) NewProfile() error {
defer unlock() defer unlock()
b.pm.NewProfile() b.pm.NewProfile()
// The new profile doesn't yet have a ControlURL because it hasn't been
// set. Conservatively reset the dialPlan.
b.resetDialPlan()
return b.resetForProfileChangeLockedOnEntry(unlock) return b.resetForProfileChangeLockedOnEntry(unlock)
} }
@ -6022,6 +6043,7 @@ func (b *LocalBackend) ResetAuth() error {
if err := b.pm.DeleteAllProfiles(); err != nil { if err := b.pm.DeleteAllProfiles(); err != nil {
return err return err
} }
b.resetDialPlan() // always reset if we're removing everything
return b.resetForProfileChangeLockedOnEntry(unlock) return b.resetForProfileChangeLockedOnEntry(unlock)
} }