Remove migrated tasks (#4744)

See #4408

Author: jmsmkn

app/grandchallenge/background_tasks/tasks.py

@@ -1,9 +1,5 @@
 from datetime import timedelta
 
-from billiard.exceptions import (
-    SoftTimeLimitExceeded as CelerySoftTimeLimitExceeded,
-)
-from django.db import transaction
 from django.db.models import (
     Avg,
     Count,
@@ -19,31 +15,12 @@
 from lambda_tasks.timeouts import SoftTimeLimitExceeded
 
 from grandchallenge.background_tasks.models import CeleryTaskDailyStats
-from grandchallenge.core.celery import acks_late_micro_short_task
-
-
-@acks_late_micro_short_task(
-    name=f"{__name__}.aggregate_celery_daily_stats",
-    singleton=True,
-    # No need to retry here as the periodic task call this again
-    ignore_errors=(
-        CelerySoftTimeLimitExceeded,
-        SoftTimeLimitExceeded,
-    ),
-)
-@transaction.atomic
-def aggregate_celery_daily_stats_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return aggregate_celery_daily_stats(**kwargs)
 
 
 @lambda_task(
     singleton=True,
     # No need to retry here as the periodic task call this again
-    ignore_errors=(
-        CelerySoftTimeLimitExceeded,
-        SoftTimeLimitExceeded,
-    ),
+    ignore_errors=(SoftTimeLimitExceeded,),
 )
 def aggregate_celery_daily_stats():
     yesterday = (timezone.now() - timedelta(days=1)).date()

app/grandchallenge/browser_sessions/tasks.py

@@ -1,17 +1,8 @@
 from django.conf import settings
-from django.db import transaction
 from django.utils.timezone import now
 from lambda_tasks.decorators import lambda_task
 
 from grandchallenge.browser_sessions.models import BrowserSession
-from grandchallenge.core.celery import acks_late_micro_short_task
-
-
-@acks_late_micro_short_task(name=f"{__name__}.logout_privileged_users")
-@transaction.atomic
-def logout_privileged_users_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return logout_privileged_users(**kwargs)
 
 
 @lambda_task
@@ -22,13 +13,6 @@ def logout_privileged_users():
     ).only("pk").delete()
 
 
-@acks_late_micro_short_task(name=f"{__name__}.clear_sessions")
-@transaction.atomic
-def clear_sessions_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return clear_sessions(**kwargs)
-
-
 @lambda_task
 def clear_sessions():
     BrowserSession.objects.filter(expire_date__lt=now()).only("pk").delete()

app/grandchallenge/github/tasks.py

@@ -13,7 +13,6 @@
 from cryptography.hazmat.primitives import serialization
 from django.conf import settings
 from django.core import files
-from django.db import transaction
 from django.db.transaction import on_commit
 from django.utils.timezone import now
 from lambda_tasks.decorators import lambda_task
@@ -180,13 +179,6 @@ def unlink_algorithm(*, pk):
         )
 
 
-@acks_late_micro_short_task(name=f"{__name__}.cleanup_expired_tokens")
-@transaction.atomic
-def cleanup_expired_tokens_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return cleanup_expired_tokens(**kwargs)
-
-
 @lambda_task
 def cleanup_expired_tokens():
     from grandchallenge.github.models import GitHubUserToken
@@ -196,12 +188,6 @@ def cleanup_expired_tokens():
     ).delete()
 
 
-@acks_late_micro_short_task(name=f"{__name__}.refresh_user_token")
-def refresh_user_token_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return refresh_user_token(**kwargs)
-
-
 @lambda_task
 def refresh_user_token(*, pk: int):
     from grandchallenge.github.models import GitHubUserToken
@@ -217,12 +203,6 @@ def refresh_user_token(*, pk: int):
     token.save()
 
 
-@acks_late_micro_short_task(name=f"{__name__}.refresh_expiring_user_tokens")
-def refresh_expiring_user_tokens_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return refresh_expiring_user_tokens(**kwargs)
-
-
 @lambda_task
 def refresh_expiring_user_tokens():
     """Refresh user tokens expiring in the next 1 to 28 days"""

app/grandchallenge/profiles/tasks.py

@@ -3,19 +3,10 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
-from django.db import transaction
 from django.utils.timezone import now
 from lambda_tasks.decorators import lambda_task
 
 from grandchallenge.browser_sessions.models import BrowserSession
-from grandchallenge.core.celery import acks_late_micro_short_task
-
-
-@acks_late_micro_short_task(name=f"{__name__}.deactivate_user")
-@transaction.atomic
-def deactivate_user_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return deactivate_user(**kwargs)
 
 
 @lambda_task
@@ -37,13 +28,6 @@ def deactivate_user(*, user_pk: int):
     BrowserSession.objects.filter(user=user).delete()
 
 
-@acks_late_micro_short_task(name=f"{__name__}.delete_users_who_dont_login")
-@transaction.atomic
-def delete_users_who_dont_login_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return delete_users_who_dont_login(**kwargs)
-
-
 @lambda_task
 def delete_users_who_dont_login():
     """Remove users who do not sign in after USER_LOGIN_TIMEOUT_DAYS"""

app/grandchallenge/publications/tasks.py

@@ -1,18 +1,9 @@
-from celery.utils.log import get_task_logger
 from lambda_tasks.decorators import lambda_task
+from lambda_tasks.logging import task_logger
 from requests.exceptions import RequestException
 
-from grandchallenge.core.celery import acks_late_2xlarge_task
 from grandchallenge.publications.models import Publication
 
-logger = get_task_logger(__name__)
-
-
-@acks_late_2xlarge_task(name=f"{__name__}.update_publication_metadata")
-def update_publication_metadata_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return update_publication_metadata(**kwargs)
-
 
 @lambda_task
 def update_publication_metadata():
@@ -22,12 +13,14 @@ def update_publication_metadata():
         try:
             csl, new_identifier = publication.identifier.csl
         except ValueError:
-            logger.warning(
+            task_logger.warning(
                 f"Identifier {publication.identifier} not recognised"
             )
             continue
         except RequestException as e:
-            logger.warning(f"Error updating {publication.identifier}: {e}")
+            task_logger.warning(
+                f"Error updating {publication.identifier}: {e}"
+            )
             continue
 
         if (

app/grandchallenge/uploads/tasks.py

@@ -1,21 +1,12 @@
 from datetime import timedelta
 
 from django.conf import settings
-from django.db import transaction
 from django.utils.timezone import now
 from lambda_tasks.decorators import lambda_task
 
-from grandchallenge.core.celery import acks_late_micro_short_task
 from grandchallenge.uploads.models import UserUpload
 
 
-@acks_late_micro_short_task(name=f"{__name__}.delete_old_user_uploads")
-@transaction.atomic
-def delete_old_user_uploads_celery(**kwargs):
-    # TODO: 4408 Remove, this is still here to handle existing tasks on SQS
-    return delete_old_user_uploads(**kwargs)
-
-
 @lambda_task
 def delete_old_user_uploads():
     UserUpload.objects.filter(