Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: wait for server tailnet background routines to exit on Close #15183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

fix: wait for server tailnet background routines to exit on Close #15183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions coderd/tailnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,15 @@ func NewServerTailnet(
})
}

derpMapUpdaterClosed := make(chan struct{})
bgRoutines := &sync.WaitGroup{}
originalDerpMap := derpMapFn()
// it's important to set the DERPRegionDialer above _before_ we set the DERP map so that if
// there is an embedded relay, we use the local in-memory dialer.
conn.SetDERPMap(originalDerpMap)
bgRoutines.Add(1)
go func() {
defer close(derpMapUpdaterClosed)
defer bgRoutines.Done()
defer logger.Debug(ctx, "polling DERPMap exited")

ticker := time.NewTicker(5 * time.Second)
defer ticker.Stop()
Expand All @@ -120,7 +122,7 @@ func NewServerTailnet(
tn := &ServerTailnet{
ctx: serverCtx,
cancel: cancel,
derpMapUpdaterClosed: derpMapUpdaterClosed,
bgRoutines: bgRoutines,
logger: logger,
tracer: traceProvider.Tracer(tracing.TracerName),
conn: conn,
Expand Down Expand Up @@ -170,8 +172,15 @@ func NewServerTailnet(
// registering the callback also triggers send of the initial node
tn.coordinatee.SetNodeCallback(tn.nodeCallback)

go tn.watchAgentUpdates()
go tn.expireOldAgents()
tn.bgRoutines.Add(2)
go func() {
defer tn.bgRoutines.Done()
tn.watchAgentUpdates()
}()
go func() {
defer tn.bgRoutines.Done()
tn.expireOldAgents()
}()
return tn, nil
}

Expand Down Expand Up @@ -204,6 +213,7 @@ func (s *ServerTailnet) Collect(metrics chan<- prometheus.Metric) {
}

func (s *ServerTailnet) expireOldAgents() {
defer s.logger.Debug(s.ctx, "stopped expiring old agents")
const (
tick = 5 * time.Minute
cutoff = 30 * time.Minute
Expand Down Expand Up @@ -255,6 +265,7 @@ func (s *ServerTailnet) doExpireOldAgents(cutoff time.Duration) {
}

func (s *ServerTailnet) watchAgentUpdates() {
defer s.logger.Debug(s.ctx, "stopped watching agent updates")
for {
conn := s.getAgentConn()
resp, ok := conn.NextUpdate(s.ctx)
Expand Down Expand Up @@ -317,9 +328,9 @@ func (s *ServerTailnet) reinitCoordinator() {
}

type ServerTailnet struct {
ctx context.Context
cancel func()
derpMapUpdaterClosed chan struct{}
ctx context.Context
cancel func()
bgRoutines *sync.WaitGroup

logger slog.Logger
tracer trace.Tracer
Expand Down Expand Up @@ -532,10 +543,12 @@ func (c *netConnCloser) Close() error {
}

func (s *ServerTailnet) Close() error {
s.logger.Info(s.ctx, "closing server tailnet")
defer s.logger.Debug(s.ctx, "server tailnet close complete")
s.cancel()
_ = s.conn.Close()
s.transport.CloseIdleConnections()
<-s.derpMapUpdaterClosed
s.bgRoutines.Wait()
return nil
}

Expand Down
2 changes: 2 additions & 0 deletions enterprise/wsproxy/wsproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@ func (s *Server) RegisterNow() error {
}

func (s *Server) Close() error {
s.Logger.Info(s.ctx, "closing workspace proxy server")
defer s.Logger.Debug(s.ctx, "finished closing workspace proxy server")
s.cancel()

var err error
Expand Down
Loading