From 450c7d2f9a2fca170dad12e4e7273fe1ba65c1c6 Mon Sep 17 00:00:00 2001 From: Arpad Borsos Date: Wed, 9 Apr 2025 14:01:27 +0200 Subject: [PATCH] Remove the `delete_timeseries` part of Repo deletion A while back in https://github.com/codecov/worker/pull/1091, I added the timeseries cleanup/deletion to the more general `Repository` cleanup logic. With that change, it is not necessary anymore to call a separate task to delete all the associated timeseries data. --- .../interactors/erase_repository.py | 1 - services/task/task.py | 10 -------- services/tests/test_task.py | 25 ------------------- 3 files changed, 36 deletions(-) diff --git a/core/commands/repository/interactors/erase_repository.py b/core/commands/repository/interactors/erase_repository.py index 804580bed8..f2d50929ba 100644 --- a/core/commands/repository/interactors/erase_repository.py +++ b/core/commands/repository/interactors/erase_repository.py @@ -11,5 +11,4 @@ def execute(self, owner_username: str, repo_name: str) -> None: owner_username, repo_name, ensure_is_admin=True ) - TaskService().delete_timeseries(repository_id=repo.repoid) TaskService().flush_repo(repository_id=repo.repoid) diff --git a/services/task/task.py b/services/task/task.py index fb4fc11d2f..50abc7fef8 100644 --- a/services/task/task.py +++ b/services/task/task.py @@ -299,16 +299,6 @@ def backfill_dataset( ), ).apply_async() - def delete_timeseries(self, repository_id: int): - log.info( - "Delete repository timeseries data", - extra=dict(repository_id=repository_id), - ) - self._create_signature( - celery_config.timeseries_delete_task_name, - kwargs=dict(repository_id=repository_id), - ).apply_async() - def transplant_report(self, repo_id: int, from_sha: str, to_sha: str) -> None: self._create_signature( "app.tasks.reports.transplant_report", diff --git a/services/tests/test_task.py b/services/tests/test_task.py index 6f564d8348..a908ad78bc 100644 --- a/services/tests/test_task.py +++ b/services/tests/test_task.py @@ -202,31 +202,6 @@ def test_backfill_dataset(mocker): signature.apply_async.assert_called_once_with() -@freeze_time("2023-06-13T10:01:01.000123") -def test_timeseries_delete(mocker): - signature_mock = mocker.patch("services.task.task.signature") - mock_route_task = mocker.patch( - "services.task.task.route_task", return_value={"queue": "celery"} - ) - TaskService().delete_timeseries(repository_id=12345) - mock_route_task.assert_called_with( - celery_config.timeseries_delete_task_name, - args=None, - kwargs=dict(repository_id=12345), - ) - signature_mock.assert_called_with( - celery_config.timeseries_delete_task_name, - args=None, - kwargs=dict(repository_id=12345), - app=celery_app, - queue="celery", - soft_time_limit=None, - time_limit=None, - headers=dict(created_timestamp="2023-06-13T10:01:01.000123"), - immutable=False, - ) - - @freeze_time("2023-06-13T10:01:01.000123") def test_flush_repo(mocker): signature_mock = mocker.patch("services.task.task.signature")