darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite DAO timeout method to take cutoff_time

Browse Source 
Previously we specified the period and calculated the cutoff time
in the function. Passing it in means we can run the method multiple
times and avoid getting "new" notifications to time out in the time
it takes to process each batch.
This commit is contained in:
Ben Thorner
2021-12-13 16:56:21 +00:00
parent b81a66da50
commit 76aeab24ce
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/celery/nightly_tasks.py
View File

@@ -117,9 +117,12 @@ def timeout_notifications():
# so that we can cope with a high volume that need processing. We've changed
# dao_timeout_notifications to return up to 100K notifications, so this task
# will operate on up to 500K - normally we only get around 20K.
cutoff_time = datetime.utcnow() - timedelta(
seconds=current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD')
)
for _ in range(0, 5):
notifications = \
dao_timeout_notifications(current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD'))
notifications = dao_timeout_notifications(cutoff_time)
for notification in notifications:
check_and_queue_callback_task(notification)

10
app/dao/notifications_dao.py
View File

@@ -489,11 +489,11 @@ def dao_delete_notifications_by_id(notification_id):
).delete(synchronize_session='fetch')
def dao_timeout_notifications(timeout_period_in_seconds):
def dao_timeout_notifications(cutoff_time):
"""
Set email and SMS notifications (only) to "temporary-failure" status.
Set email and SMS notifications (only) to "temporary-failure" status
if they're still sending from before the specified cutoff_time.
"""
timeout_start = datetime.utcnow() - timedelta(seconds=timeout_period_in_seconds)
updated_at = datetime.utcnow()
current_statuses = [NOTIFICATION_SENDING, NOTIFICATION_PENDING]
new_status = NOTIFICATION_TEMPORARY_FAILURE
@@ -503,13 +503,13 @@ def dao_timeout_notifications(timeout_period_in_seconds):
# - we believe this is a OOM error but there are no logs. From
# experimentation we've found we can safely process up to 100K.
notifications = Notification.query.filter(
Notification.created_at < timeout_start,
Notification.created_at < cutoff_time,
Notification.status.in_(current_statuses),
Notification.notification_type.in_([SMS_TYPE, EMAIL_TYPE])
).limit(100000).all()
Notification.query.filter(
Notification.created_at < timeout_start,
Notification.created_at < cutoff_time,
Notification.status.in_(current_statuses),
Notification.notification_type.in_([SMS_TYPE, EMAIL_TYPE]),
Notification.id.in_([n.id for n in notifications]),