From 25de8a6f163d90a9848d880a0da064d74ddfd088 Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2026 10:35:30 +0000
Subject: [PATCH] fix(worker): Optimize N+1 queries in ProcessFlakesTask

---
 .../test_analytics/ta_process_flakes.py       | 56 ++++++++++++++++---
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/apps/worker/services/test_analytics/ta_process_flakes.py b/apps/worker/services/test_analytics/ta_process_flakes.py
index 61cf26df09..2b9cba2ca3 100644
--- a/apps/worker/services/test_analytics/ta_process_flakes.py
+++ b/apps/worker/services/test_analytics/ta_process_flakes.py
@@ -42,7 +42,28 @@ def get_testruns(upload: ReportSession) -> QuerySet[Testrun]:
     ).order_by("timestamp")
 
 
-def handle_pass(curr_flakes: dict[bytes, Flake], test_id: bytes):
+def get_testruns_for_uploads(
+    uploads: QuerySet[ReportSession],
+) -> dict[int, list[Testrun]]:
+    """Fetch all testruns for a collection of uploads in a single query,
+    returning a dict keyed by upload_id to avoid N+1 queries."""
+    upload_ids = [upload.id for upload in uploads]
+    testruns = Testrun.objects.filter(
+        Q(timestamp__gte=timezone.now() - timedelta(days=1))
+        & Q(upload_id__in=upload_ids)
+    ).order_by("timestamp")
+
+    result: dict[int, list[Testrun]] = {uid: [] for uid in upload_ids}
+    for testrun in testruns:
+        result[testrun.upload_id].append(testrun)
+    return result
+
+
+def handle_pass(
+    curr_flakes: dict[bytes, Flake],
+    test_id: bytes,
+    expired_flakes: list[Flake],
+):
     # possible that we expire it and stop caring about it
     if test_id not in curr_flakes:
         return
@@ -51,7 +72,7 @@ def handle_pass(curr_flakes: dict[bytes, Flake], test_id: bytes):
     curr_flakes[test_id].count += 1
     if curr_flakes[test_id].recent_passes_count == 30:
         curr_flakes[test_id].end_date = timezone.now()
-        curr_flakes[test_id].save()
+        expired_flakes.append(curr_flakes[test_id])
         del curr_flakes[test_id]
 
 
@@ -81,10 +102,12 @@ def handle_failure(
 
 @sentry_sdk.trace
 def process_single_upload(
-    upload: ReportSession, curr_flakes: dict[bytes, Flake], repo_id: int
+    upload: ReportSession,
+    curr_flakes: dict[bytes, Flake],
+    repo_id: int,
+    testruns: list[Testrun],
+    expired_flakes: list[Flake],
 ):
-    testruns = get_testruns(upload)
-
     for testrun in testruns:
         test_id = bytes(testrun.test_id)
         match testrun.outcome:
@@ -92,7 +115,7 @@ def process_single_upload(
                 if test_id not in curr_flakes:
                     continue
 
-                handle_pass(curr_flakes, test_id)
+                handle_pass(curr_flakes, test_id, expired_flakes)
             case "failure" | "flaky_fail" | "error":
                 handle_failure(curr_flakes, test_id, testrun, repo_id)
             case _:
@@ -106,7 +129,7 @@ def process_flakes_for_commit(repo_id: int, commit_id: str):
     log.info(
         "process_flakes_for_commit: starting processing",
     )
-    uploads = get_relevant_uploads(repo_id, commit_id)
+    uploads = list(get_relevant_uploads(repo_id, commit_id))
 
     log.info(
         "process_flakes_for_commit: fetched uploads",
@@ -120,8 +143,18 @@ def process_flakes_for_commit(repo_id: int, commit_id: str):
         extra={"flakes": [flake.test_id.hex() for flake in curr_flakes.values()]},
     )
 
+    # Batch-fetch all testruns for all uploads in a single query to avoid N+1
+    testruns_by_upload = get_testruns_for_uploads(uploads)
+    expired_flakes: list[Flake] = []
+
     for upload in uploads:
-        process_single_upload(upload, curr_flakes, repo_id)
+        process_single_upload(
+            upload,
+            curr_flakes,
+            repo_id,
+            testruns_by_upload[upload.id],
+            expired_flakes,
+        )
         log.info(
             "process_flakes_for_commit: processed upload",
             extra={"upload": upload.id},
@@ -139,6 +172,13 @@ def process_flakes_for_commit(repo_id: int, commit_id: str):
         update_fields=["end_date", "count", "recent_passes_count", "fail_count"],
     )
 
+    # Bulk-update expired flakes (those that reached 30 recent passes) in one query
+    if expired_flakes:
+        Flake.objects.bulk_update(
+            expired_flakes,
+            ["end_date", "count", "recent_passes_count"],
+        )
+
 
 @sentry_sdk.trace
 def process_flakes_for_repo(repo_id: int):