synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Avoid deadlock in AgentReportStats Close during agent Close (#5415)

Browse Source 
Since AgentReportStats takes a stats function which was doing mutex
locking on agent shutdown, it was possible for there to be a deadlock
depending on how the AgentReportsStats Close function is implemented.

This mostly seems to happen on Windows test runners as it's pretty hard
to hit this edge case. The bug currently only exists in the test
implementation of AgentReportStats, however, this was refactored to be
more robust in case of future changes.
This commit is contained in:
Mathias Fredriksson
2022-12-14 18:45:46 +02:00
committed by GitHub
parent 8e702d89bb
commit 012a9e759e
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
agent/agent.go
View File

@ -226,6 +226,25 @@ func (a *agent) run(ctx context.Context) error {
_ = network.Close() _ = network.Close()
return xerrors.New("agent is closed") return xerrors.New("agent is closed")
} }
// Report statistics from the created network.
cl, err := a.client.AgentReportStats(ctx, a.logger, func() *codersdk.AgentStats {
stats := network.ExtractTrafficStats()
return convertAgentStats(stats)
})
if err != nil {
a.logger.Error(ctx, "report stats", slog.Error(err))
} else {
if err = a.trackConnGoroutine(func() {
// This is OK because the agent never re-creates the tailnet
// and the only shutdown indicator is agent.Close().
<-a.closed
_ = cl.Close()
}); err != nil {
a.logger.Debug(ctx, "report stats goroutine", slog.Error(err))
_ = cl.Close()
}
}
} else { } else {
// Update the DERP map! // Update the DERP map!
network.SetDERPMap(metadata.DERPMap) network.SetDERPMap(metadata.DERPMap)
@ -561,28 +580,6 @@ func (a *agent) init(ctx context.Context) {
} }
go a.runLoop(ctx) go a.runLoop(ctx)
cl, err := a.client.AgentReportStats(ctx, a.logger, func() *codersdk.AgentStats {
stats := map[netlogtype.Connection]netlogtype.Counts{}
a.closeMutex.Lock()
if a.network != nil {
stats = a.network.ExtractTrafficStats()
}
a.closeMutex.Unlock()
return convertAgentStats(stats)
})
if err != nil {
a.logger.Error(ctx, "report stats", slog.Error(err))
return
}
if err = a.trackConnGoroutine(func() {
<-a.closed
_ = cl.Close()
}); err != nil {
a.logger.Error(ctx, "report stats goroutine", slog.Error(err))
_ = cl.Close()
return
}
} }
func convertAgentStats(counts map[netlogtype.Connection]netlogtype.Counts) *codersdk.AgentStats { func convertAgentStats(counts map[netlogtype.Connection]netlogtype.Counts) *codersdk.AgentStats {