Browse Source

chore(deletions) Remove deletion task compatibility shims (#77704)

Remove tasks bound to the old names as we aren't creating any new tasks
with those names.

Refs #77479
Mark Story 5 months ago
parent
commit
9b4b3b8951

+ 0 - 19
src/sentry/deletions/tasks/groups.py

@@ -57,22 +57,3 @@ def delete_groups(
         # all groups have been deleted
         if eventstream_state:
             eventstream.backend.end_delete_groups(eventstream_state)
-
-
-@instrumented_task(
-    name="sentry.tasks.deletion.delete_groups",
-    queue="cleanup",
-    default_retry_delay=60 * 5,
-    max_retries=MAX_RETRIES,
-    acks_late=True,
-    silo_mode=SiloMode.REGION,
-)
-@retry(exclude=(DeleteAborted,))
-@track_group_async_operation
-def delete_groups_old(
-    object_ids: Sequence[int],
-    transaction_id: str | None = None,
-    eventstream_state: Mapping[str, Any] | None = None,
-    **kwargs: Any,
-) -> None:
-    delete_groups(object_ids, transaction_id, eventstream_state, **kwargs)

+ 0 - 50
src/sentry/deletions/tasks/hybrid_cloud.py

@@ -125,17 +125,6 @@ def schedule_hybrid_cloud_foreign_key_jobs_control():
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.hybrid_cloud.schedule_hybrid_cloud_foreign_key_jobs_control",
-    queue="cleanup.control",
-    acks_late=True,
-    silo_mode=SiloMode.CONTROL,
-)
-def schedule_hybrid_cloud_foreign_key_jobs_control_old():
-    # Deprecated deploy boundary shim
-    schedule_hybrid_cloud_foreign_key_jobs_control()
-
-
 @instrumented_task(
     name="sentry.deletions.tasks.hybrid_cloud.schedule_hybrid_cloud_foreign_key_jobs",
     queue="cleanup",
@@ -151,17 +140,6 @@ def schedule_hybrid_cloud_foreign_key_jobs():
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.hybrid_cloud.schedule_hybrid_cloud_foreign_key_jobs",
-    queue="cleanup",
-    acks_late=True,
-    silo_mode=SiloMode.REGION,
-)
-def schedule_hybrid_cloud_foreign_key_jobs_old():
-    # Deprecated deploy boundary shim
-    schedule_hybrid_cloud_foreign_key_jobs()
-
-
 def _schedule_hybrid_cloud_foreign_key(silo_mode: SiloMode, cascade_task: Task) -> None:
     for app, app_models in apps.all_models.items():
         for model in app_models.values():
@@ -205,21 +183,6 @@ def process_hybrid_cloud_foreign_key_cascade_batch_control(
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.process_hybrid_cloud_foreign_key_cascade_batch_control",
-    queue="cleanup.control",
-    acks_late=True,
-    silo_mode=SiloMode.CONTROL,
-)
-def process_hybrid_cloud_foreign_key_cascade_batch_control_old(
-    app_name: str, model_name: str, field_name: str, **kwargs: Any
-) -> None:
-    # Deprecated deploy boundary shim
-    process_hybrid_cloud_foreign_key_cascade_batch_control(
-        app_name, model_name, field_name, **kwargs
-    )
-
-
 @instrumented_task(
     name="sentry.deletions.tasks.process_hybrid_cloud_foreign_key_cascade_batch",
     queue="cleanup",
@@ -241,19 +204,6 @@ def process_hybrid_cloud_foreign_key_cascade_batch(
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.process_hybrid_cloud_foreign_key_cascade_batch",
-    queue="cleanup",
-    acks_late=True,
-    silo_mode=SiloMode.REGION,
-)
-def process_hybrid_cloud_foreign_key_cascade_batch_old(
-    app_name: str, model_name: str, field_name: str, **kwargs: Any
-) -> None:
-    # Deprecated deploy boundary shim
-    process_hybrid_cloud_foreign_key_cascade_batch(app_name, model_name, field_name)
-
-
 def _process_hybrid_cloud_foreign_key_cascade(
     app_name: str, model_name: str, field_name: str, process_task: Task, silo_mode: SiloMode
 ) -> None:

+ 0 - 68
src/sentry/deletions/tasks/scheduled.py

@@ -35,17 +35,6 @@ def reattempt_deletions_control():
     _reattempt_deletions(ScheduledDeletion)
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.reattempt_deletions_control",
-    queue="cleanup.control",
-    acks_late=True,
-    silo_mode=SiloMode.CONTROL,
-)
-def reattempt_deletions_control_old():
-    # Deprecated deploy boundary shim
-    reattempt_deletions_control()
-
-
 @instrumented_task(
     name="sentry.deletions.tasks.reattempt_deletions",
     queue="cleanup",
@@ -56,17 +45,6 @@ def reattempt_deletions():
     _reattempt_deletions(RegionScheduledDeletion)
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.reattempt_deletions",
-    queue="cleanup",
-    acks_late=True,
-    silo_mode=SiloMode.REGION,
-)
-def reattempt_deletions_old():
-    # Deprecated deploy boundary shim
-    reattempt_deletions()
-
-
 def _reattempt_deletions(model_class: type[BaseScheduledDeletion]) -> None:
     # If a deletion is in progress and was scheduled to run more than
     # a day ago we can assume the previous job died/failed.
@@ -90,16 +68,6 @@ def run_scheduled_deletions_control() -> None:
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.run_scheduled_deletions_control",
-    queue="cleanup.control",
-    acks_late=True,
-)
-def run_scheduled_deletions_control_old() -> None:
-    # Deprecated deploy boundary shim
-    run_scheduled_deletions_control()
-
-
 @instrumented_task(
     name="sentry.deletions.tasks.run_scheduled_deletions", queue="cleanup", acks_late=True
 )
@@ -110,14 +78,6 @@ def run_scheduled_deletions() -> None:
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.run_scheduled_deletions", queue="cleanup", acks_late=True
-)
-def run_scheduled_deletions_old() -> None:
-    # Deprecated deploy boundary shim
-    run_scheduled_deletions()
-
-
 def _run_scheduled_deletions(model_class: type[BaseScheduledDeletion], process_task: Task) -> None:
     queryset = model_class.objects.filter(in_progress=False, date_scheduled__lte=timezone.now())
     for item in queryset:
@@ -150,20 +110,6 @@ def run_deletion_control(deletion_id, first_pass=True, **kwargs: Any):
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.run_deletion_control",
-    queue="cleanup.control",
-    default_retry_delay=60 * 5,
-    max_retries=MAX_RETRIES,
-    acks_late=True,
-    silo_mode=SiloMode.CONTROL,
-)
-@retry(exclude=(DeleteAborted,))
-def run_deletion_control_old(deletion_id, first_pass=True, **kwargs: Any):
-    # Deprecated deploy boundary shim
-    run_deletion_control(deletion_id, first_pass, **kwargs)
-
-
 @instrumented_task(
     name="sentry.deletions.tasks.run_deletion",
     queue="cleanup",
@@ -182,20 +128,6 @@ def run_deletion(deletion_id, first_pass=True, **kwargs: Any):
     )
 
 
-@instrumented_task(
-    name="sentry.tasks.deletion.run_deletion",
-    queue="cleanup",
-    default_retry_delay=60 * 5,
-    max_retries=MAX_RETRIES,
-    acks_late=True,
-    silo_mode=SiloMode.REGION,
-)
-@retry(exclude=(DeleteAborted,))
-def run_deletion_old(deletion_id, first_pass=True, **kwargs: Any):
-    # Deprecated deploy boundary shim
-    run_deletion(deletion_id, first_pass, **kwargs)
-
-
 def _run_deletion(
     deletion_id: int,
     first_pass: bool,