Skip to content

Commit e62159f

Browse files
authored
fix(issues): Handle organization deletions (#94566)
Fixes SENTRY-401Q
1 parent 7e59f27 commit e62159f

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

src/sentry/tasks/codeowners/update_code_owners_schema.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
from __future__ import annotations
22

3+
import logging
34
from collections.abc import Iterable
45
from typing import Any
56

67
from sentry import features
7-
from sentry.models.organization import Organization
8+
from sentry.models.organization import Organization, OrganizationStatus
89
from sentry.silo.base import SiloMode
910
from sentry.tasks.base import instrumented_task, load_model_from_db, retry
1011
from sentry.taskworker.config import TaskworkerConfig
1112
from sentry.taskworker.namespaces import issues_tasks
1213
from sentry.taskworker.retry import Retry
1314

15+
logger = logging.getLogger(__name__)
16+
1417

1518
@instrumented_task(
1619
name="sentry.tasks.update_code_owners_schema",
@@ -38,7 +41,22 @@ def update_code_owners_schema(
3841
)
3942
from sentry.models.projectcodeowners import ProjectCodeOwners
4043

41-
org = load_model_from_db(Organization, organization)
44+
# This task is enqueued when projects and teams are deleted. If the
45+
# organization itself has also been deleted we're all done here.
46+
try:
47+
org = load_model_from_db(Organization, organization)
48+
except Organization.DoesNotExist:
49+
logger.warning(
50+
"Skipping update_code_owners_schema: organization does not exist",
51+
extra={"organization_id": organization, "integration_id": integration},
52+
)
53+
return
54+
if org.status == OrganizationStatus.DELETION_IN_PROGRESS:
55+
logger.warning(
56+
"Skipping update_code_owners_schema: organization deletion in progress",
57+
extra={"organization_id": organization, "integration_id": integration},
58+
)
59+
return
4260

4361
if not features.has("organizations:integrations-codeowners", org):
4462
return

0 commit comments

Comments
 (0)