fix(aci): Reduce deadlock risk in ActionGroupStatus updates (#92451)

kcons · andrewshie-sentry · commit 0615d1324e0f · 2025-06-02T12:46:09.000-07:00
Order ActionGroupStatus updates to ensure consistent row locking order across concurrent executions, potentially avoiding deadlocks. Also limit updates to where date_updated is actually newer, which could theoretically reduce overlap between concurrent update queries. See SENTRY-3WEA.
diff --git a/src/sentry/workflow_engine/processors/action.py b/src/sentry/workflow_engine/processors/action.py
@@ -112,9 +112,9 @@ def filter_recently_fired_workflow_actions(
         statuses.filter(difference__gt=F("frequency_minutes")).values_list("action_id", flat=True)
     )
 
-    ActionGroupStatus.objects.filter(action__in=actions_to_include, group=group).update(
-        date_updated=now
-    )
+    ActionGroupStatus.objects.filter(
+        action__in=actions_to_include, group=group, date_updated__lt=now
+    ).order_by("id").update(date_updated=now)
     ActionGroupStatus.objects.bulk_create(
         [
             ActionGroupStatus(action=action, group=group, date_updated=now)

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,9 @@ def filter_recently_fired_workflow_actions(`
`112`	`112`	`statuses.filter(difference__gt=F("frequency_minutes")).values_list("action_id", flat=True)`
`113`	`113`	`)`
`114`	`114`
`115`		`- ActionGroupStatus.objects.filter(action__in=actions_to_include, group=group).update(`
`116`		`- date_updated=now`
`117`		`- )`
	`115`	`+ ActionGroupStatus.objects.filter(`
	`116`	`+ action__in=actions_to_include, group=group, date_updated__lt=now`
	`117`	`+ ).order_by("id").update(date_updated=now)`
`118`	`118`	`ActionGroupStatus.objects.bulk_create(`
`119`	`119`	`[`
`120`	`120`	`ActionGroupStatus(action=action, group=group, date_updated=now)`