Unlocked deadlocks inside nil-check conditions (#1029)

john-david3 · web-flow · commit 380f6658aada · 2025-04-15T14:06:26.000+01:00
diff --git a/internal/command/command_service.go b/internal/command/command_service.go
@@ -101,6 +101,7 @@ func (cs *CommandService) UpdateDataPlaneStatus(
 
 		cs.subscribeClientMutex.Lock()
 		if cs.commandServiceClient == nil {
+			cs.subscribeClientMutex.Unlock()
 			return nil, errors.New("command service client is not initialized")
 		}
 		response, updateError := cs.commandServiceClient.UpdateDataPlaneStatus(ctx, request)
@@ -378,6 +379,7 @@ func (cs *CommandService) dataPlaneHealthCallback(
 
 		cs.subscribeClientMutex.Lock()
 		if cs.commandServiceClient == nil {
+			cs.subscribeClientMutex.Unlock()
 			return nil, errors.New("command service client is not initialized")
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ func (cs *CommandService) UpdateDataPlaneStatus(`
`101`	`101`
`102`	`102`	`cs.subscribeClientMutex.Lock()`
`103`	`103`	`if cs.commandServiceClient == nil {`
	`104`	`+ cs.subscribeClientMutex.Unlock()`
`104`	`105`	`return nil, errors.New("command service client is not initialized")`
`105`	`106`	`}`
`106`	`107`	`response, updateError := cs.commandServiceClient.UpdateDataPlaneStatus(ctx, request)`
`@@ -378,6 +379,7 @@ func (cs *CommandService) dataPlaneHealthCallback(`
`378`	`379`
`379`	`380`	`cs.subscribeClientMutex.Lock()`
`380`	`381`	`if cs.commandServiceClient == nil {`
	`382`	`+ cs.subscribeClientMutex.Unlock()`
`381`	`383`	`return nil, errors.New("command service client is not initialized")`
`382`	`384`	`}`
`383`	`385`