lock for delete (#75)

micromdm · Nov 27, 2024 · 7d76fa7 · 7d76fa7
1 parent 0ee5b5c
commit 7d76fa7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/engine/storage/mysql/query.sql b/engine/storage/mysql/query.sql
@@ -128,6 +128,16 @@ WHERE
   step_id = ? AND
   completed != 0;
 
+-- name: LockIDCommandsByStepID :exec
+SELECT
+  command_uuid
+FROM
+  id_commands
+WHERE
+  enrollment_id = ? AND
+  step_id = ?
+FOR UPDATE;
+
 -- name: RemoveIDCommandsByStepID :exec
 DELETE FROM
   id_commands

diff --git a/engine/storage/mysql/sqlc/query.sql.go b/engine/storage/mysql/sqlc/query.sql.go
diff --git a/engine/storage/mysql/storage.go b/engine/storage/mysql/storage.go
@@ -97,7 +97,13 @@ func (s *MySQLStorage) StoreCommandResponseAndRetrieveCompletedStep(ctx context.
 			Commands: []storage.StepCommandResult{*sc},
 		}
 
-		// TODO: select ... for update on id commands?
+		err = qtx.LockIDCommandsByStepID(ctx, sqlc.LockIDCommandsByStepIDParams{
+			EnrollmentID: id,
+			StepID:       cmdCt.StepID,
+		})
+		if err != nil {
+			return fmt.Errorf("lock commands by step by id (%d): %w", cmdCt.StepID, err)
+		}
 
 		cmdR, err := qtx.GetIDCommandsByStepID(ctx, sqlc.GetIDCommandsByStepIDParams{
 			EnrollmentID: id,