TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 14:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale: fix sporadic 'context canceled' error on 'up'

Browse Source 
Fixes #2333

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-08-19 08:44:39 -07:00
parent faa891c1f2
commit edb338f542
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/tailscale/cli/up.go
View File

@ -478,6 +478,13 @@ func runUp(ctx context.Context, args []string) error {
} }
} }
// This whole 'up' mechanism is too complicated and results in
// hairy stuff like this select. We're ultimately waiting for
// 'startingOrRunning' to be done, but even in the case where
// it succeeds, other parts may shut down concurrently so we
// need to prioritize reads from 'startingOrRunning' if it's
// readable; its send does happen before the pump mechanism
// shuts down. (Issue 2333)
select { select {
case <-startingOrRunning: case <-startingOrRunning:
return nil return nil
@ -489,6 +496,11 @@ func runUp(ctx context.Context, args []string) error {
} }
return pumpCtx.Err() return pumpCtx.Err()
case err := <-pumpErr: case err := <-pumpErr:
select {
case <-startingOrRunning:
return nil
default:
}
return err return err
} }
} }