Merge pull request #1477 from GSA/revert-1475-main

Revert previous hotfixes

app/celery/provider_tasks.py

@@ -1,6 +1,5 @@
 import json
 import os
-import random
 from datetime import timedelta
 
 from botocore.exceptions import ClientError
@@ -30,7 +29,8 @@
 @notify_celery.task(
     bind=True,
     name="check_sms_delivery_receipt",
-    max_retries=72,
+    max_retries=48,
+    default_retry_delay=300,
 )
 def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
     """
@@ -62,10 +62,7 @@ def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
                 carrier=carrier,
                 provider_response=provider_response,
             )
-            base_delay = 3600  # one hour
-            jitter = random.randint(-1200, +1200)  # nosec B311
-            retry_delay = base_delay + jitter
-            raise self.retry(countdown=retry_delay, exc=ntfe)
+            raise self.retry(exc=ntfe)
         except ClientError as err:
             # Probably a ThrottlingException but could be something else
             error_code = err.response["Error"]["Code"]
@@ -80,10 +77,7 @@ def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
                 carrier=carrier,
                 provider_response=provider_response,
             )
-            base_delay = 3600  # one hour
-            jitter = random.randint(-1200, +1200)  # nosec B311
-            retry_delay = base_delay + jitter
-            raise self.retry(countdown=retry_delay, exc=err)
+            raise self.retry(exc=err)
 
     if status == "success":
         status = NotificationStatus.DELIVERED

app/clients/cloudwatch/aws_cloudwatch.py

@@ -158,7 +158,7 @@ def check_sms(self, message_id, notification_id, created_at):
                 message["delivery"].get("phoneCarrier", "Unknown Carrier"),
             )
 
-        if time_now > (created_at + timedelta(hours=73)):
+        if time_now > (created_at + timedelta(hours=3)):
             # see app/models.py Notification. This message corresponds to "permanent-failure",
             # but we are copy/pasting here to avoid circular imports.
             return "failure", "Unable to find carrier response."

app/config.py

@@ -167,7 +167,7 @@ class Config(object):
     current_minute = (datetime.now().minute + 1) % 60
 
     CELERY = {
-        "worker_max_tasks_per_child": 2000,
+        "worker_max_tasks_per_child": 500,
         "broker_url": REDIS_URL,
         "broker_transport_options": {
             "visibility_timeout": 310,