mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-05-18 07:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent deadlock when stream error occurs - make cmds send non-blocking

Browse Source 
If managerLoop is blocked (e.g., waiting on regWait), a blocking send to cmds
will deadlock handleIncoming. Make the send non-blocking to prevent this.
This commit is contained in:
Chris Lu
2025-12-22 00:16:03 -08:00
parent 85369414f9
commit 3ebbd25a4b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/worker/client.go
View File

@@ -446,8 +446,12 @@ func handleIncoming(
default:
}
// Report the failure as a command to the managerLoop (blocking)
cmds <- grpcCommand{action: ActionStreamError, data: err}
// Report the failure as a command to the managerLoop (non-blocking to prevent deadlock)
select {
case cmds <- grpcCommand{action: ActionStreamError, data: err}:
default:
glog.V(2).Infof("Manager busy, stream error not queued: %v", err)
}
// Exit the main handler loop
glog.V(1).Infof("INCOMING HANDLER STOPPED: Worker %s stopping incoming handler due to stream error", workerID)