fix(deletions): Try next available group and abort if none found (#95331)

Fixes [SENTRY-45X2](https://sentry.sentry.io/issues/6731915490/)
Fixes [SENTRY-43KR](https://sentry.sentry.io/issues/6710200116/)

Author: armenzg

pyproject.toml

@@ -464,6 +464,7 @@ module = [
     "tests.sentry.api.endpoints.test_project_repo_path_parsing",
     "tests.sentry.api.helpers.test_error_upsampling",
     "tests.sentry.audit_log.services.*",
+    "tests.sentry.deletions.tasks.test_groups",
     "tests.sentry.deletions.test_group",
     "tests.sentry.event_manager.test_event_manager",
     "tests.sentry.grouping.seer_similarity.test_get_seer_similar_issues",

src/sentry/deletions/tasks/groups.py

@@ -39,7 +39,14 @@ def delete_groups(
     from sentry import deletions, eventstream
     from sentry.models.group import Group
 
-    first_group = Group.objects.get(id=object_ids[0])
+    max_batch_size = 100
+    current_batch, rest = object_ids[:max_batch_size], object_ids[max_batch_size:]
+
+    # Select first_group from current_batch to ensure project_id tag reflects the current batch
+    first_group = Group.objects.filter(id__in=current_batch).order_by("id").first()
+    if not first_group:
+        raise DeleteAborted("delete_groups.no_group_found")
+
     # The tags can be used if we want to find errors for when a task fails
     sentry_sdk.set_tags(
         {
@@ -48,8 +55,6 @@ def delete_groups(
         },
     )
 
-    max_batch_size = 100
-    current_batch, rest = object_ids[:max_batch_size], object_ids[max_batch_size:]
     transaction_id = transaction_id or uuid4().hex
 
     logger.info(

tests/sentry/deletions/tasks/test_groups.py

@@ -1,8 +1,11 @@
 from uuid import uuid4
 
+import pytest
+
 from sentry import nodestore
 from sentry.deletions.tasks.groups import delete_groups
 from sentry.eventstore.models import Event
+from sentry.exceptions import DeleteAborted
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.grouphash import GroupHash
@@ -17,7 +20,7 @@
 
 
 class DeleteGroupTest(TestCase):
-    def test_simple(self):
+    def test_simple(self) -> None:
         event_id = "a" * 32
         event_id_2 = "b" * 32
         project = self.create_project()
@@ -65,3 +68,22 @@ def test_simple(self):
         assert not Group.objects.filter(id=group.id).exists()
         assert not nodestore.backend.get(node_id)
         assert not nodestore.backend.get(node_id_2)
+
+    def test_first_group_not_found(self) -> None:
+        group = self.create_group()
+        group2 = self.create_group()
+        group_ids = [group.id, group2.id]
+        group.delete()
+
+        with self.tasks():
+            delete_groups(object_ids=group_ids)
+
+        assert Group.objects.count() == 0
+
+    def test_no_first_group_found(self) -> None:
+        group = self.create_group()
+        group_ids = [group.id]
+        group.delete()
+
+        with self.tasks(), pytest.raises(DeleteAborted):
+            delete_groups(object_ids=group_ids)