From ac51541236391112a0bfb8ba416e046051464da4 Mon Sep 17 00:00:00 2001 From: Tom Proctor Date: Tue, 25 Nov 2025 09:38:53 +0000 Subject: [PATCH] tsnet: respond quickly to state changes in auth loop tsnet has a 5s sleep as part of its logic waiting for login to succeed. Add an additional channel that will interrupt this sleep early if the local backend's state changes before then. This is early enough in the bootstrap logic that the local client has not been set up yet, so we subscribe directly on the local backend in keeping with the rest of the function, but it would be nice to port the whole function to the new eventbus in a separate change. This was noticed while debugging what makes tsconsensus tests slow, but it probably affects other test suites as well. Updates #16340 Change-Id: I7a28fd3927bbcdead9a5aad39f4a3596b5f659b0 Signed-off-by: Tom Proctor --- tsnet/tsnet.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go index 14747650f..b9e4634de 100644 --- a/tsnet/tsnet.go +++ b/tsnet/tsnet.go @@ -804,6 +804,22 @@ func (s *Server) logf(format string, a ...any) { // printAuthURLLoop loops once every few seconds while the server is still running and // is in NeedsLogin state, printing out the auth URL. func (s *Server) printAuthURLLoop() { + ctx, cancel := context.WithCancel(s.shutdownCtx) + defer cancel() + stateCh := make(chan struct{}, 1) + go s.lb.WatchNotifications(ctx, ipn.NotifyInitialState, nil, func(n *ipn.Notify) (keepGoing bool) { + if n.State == nil { + return true + } + + // No need to block, we only want to make sure the loop below is not + // blocking on time.After if there's a new state available. + select { + case stateCh <- struct{}{}: + default: + } + return true + }) for { if s.shutdownCtx.Err() != nil { return @@ -818,6 +834,7 @@ func (s *Server) printAuthURLLoop() { } select { case <-time.After(5 * time.Second): + case <-stateCh: case <-s.shutdownCtx.Done(): return }