fix: test + late release lock in handler

Author: SalmaElsoly

backend/internal/api/handlers/deployment_handler.go

@@ -258,10 +258,6 @@ func (h *DeploymentHandler) HandleDeployCluster(c *gin.Context) {
 	wfUUID, wfStatus, err := h.svc.AsyncDeployCluster(config, cluster)
 	if err != nil {
 		reqLog.Error().Err(err).Msg("failed to start deployment workflow")
-		err = h.locker.ReleaseLock(c.Request.Context(), nodeIDs, wfUUID)
-		if err != nil {
-			reqLog.Error().Err(err).Msg("failed to release nodes locks")
-		}
 		InternalServerError(c)
 		return
 	}
@@ -443,10 +439,6 @@ func (h *DeploymentHandler) HandleAddNode(c *gin.Context) {
 	wfUUID, wfStatus, err := h.svc.AsyncAddNode(config, cl, cluster.Nodes[0])
 	if err != nil {
 		reqLog.Error().Err(err).Msg("failed to start add node workflow")
-		err = h.locker.ReleaseLock(c.Request.Context(), []uint32{cluster.Nodes[0].NodeID}, wfUUID)
-		if err != nil {
-			reqLog.Error().Err(err).Msg("failed to release nodes locks")
-		}
 		InternalServerError(c)
 		return
 	}

backend/internal/api/handlers/node_handler.go

@@ -310,10 +310,6 @@ func (h *NodeHandler) ReserveNodeHandler(c *gin.Context) {
 	wfUUID, err := h.svc.AsyncReserveNode(userID, user.Mnemonic, nodeID)
 	if err != nil {
 		reqLog.Error().Err(err).Msg("failed to start workflow to reserve node")
-		err = h.locker.ReleaseLock(c.Request.Context(), []uint32{nodeID}, wfUUID)
-		if err != nil {
-			reqLog.Error().Err(err).Msg("failed to release nodes locks")
-		}
 		InternalServerError(c)
 		return
 	}

backend/internal/core/distributed_locks/redis_locker_test.go

@@ -47,7 +47,8 @@ func TestRedisLocker_AcquireNodesLocks_NodeAlreadyLocked(t *testing.T) {
 	err := locker.AcquireNodesLocks(context.Background(), []uint32{1, 2})
 
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "failed to acquire lock for key locked:2")
+	require.ErrorIs(t, err, ErrNodeLocked)
+	require.Contains(t, err.Error(), "locked:2")
 	require.Equal(t, int64(0), client.Exists(context.Background(), "locked:1").Val(), "previous locks should be rolled back")
 }
 

backend/internal/core/services/deployment_service.go

@@ -244,6 +244,11 @@ func (svc *DeploymentService) handleDeploymentAction(userID int, workflowName st
 	}
 
 	if err = svc.runWithQueue(queueName, &wf); err != nil {
+		if len(nodeIDs) > 0 {
+			if releaseErr := svc.locker.ReleaseLock(svc.appCtx, nodeIDs, wf.UUID); releaseErr != nil {
+				err = fmt.Errorf("%w: failed to release workflow lock: %v", err, releaseErr)
+			}
+		}
 		telemetry.RecordError(span, err)
 		return "", "", err
 	}

backend/internal/core/services/node_service.go

@@ -256,6 +256,9 @@ func (svc *NodeService) AsyncReserveNode(userID int, userMnemonic string, nodeID
 	}
 
 	if err = svc.runWithQueue(queueName, &wf); err != nil {
+		if releaseErr := svc.locker.ReleaseLock(svc.appCtx, []uint32{nodeID}, wf.UUID); releaseErr != nil {
+			err = fmt.Errorf("%w: failed to release workflow lock: %v", err, releaseErr)
+		}
 		return "", err
 	}