sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-04 16:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(engine): avoid deadlock when stopping engine during debug bundle

Browse Source
This commit is contained in:
aliamerj
2025-09-16 21:06:54 +03:00
parent 9d5694ff4c
commit 889c3c8f8d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/internal/engine.go
View File

@@ -927,12 +927,16 @@ func (e *Engine) receiveJobEvents() {
}
func (e *Engine) handleBundle(params *mgmProto.BundleParameters) (*mgmProto.JobResponse_Bundle, error) {
// todo: @Vic, do we need to latest sync response all the time here or could it be nil in the debug bundle?
// todo: e.GetLatestSyncResponse() is exported and has been protected by a mutex. If you will use handleBundle in
// also protected context then will be deadlock
syncResponse, err := e.GetLatestSyncResponse()
if err != nil {
return nil, fmt.Errorf("get latest sync response: %w", err)
// Access sync response directly without calling exported method to avoid deadlock
// This is safe because we're in a goroutine that doesn't hold the syncMsgMux
var syncResponse *mgmProto.SyncResponse
if e.persistSyncResponse && e.latestSyncResponse != nil {
log.Debugf("Retrieving latest sync response with size %d bytes", proto.Size(e.latestSyncResponse))
if sr, ok := proto.Clone(e.latestSyncResponse).(*mgmProto.SyncResponse); ok {
syncResponse = sr
} else {
return nil, fmt.Errorf("failed to clone sync response")
}
}
if syncResponse == nil {