darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 16:01:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

only retry if the broadcast message task is in sending

Browse Source 
previously we would retry if the task was queued up for retry but the
status is in "received-ack" or "received-err". We don't expect that a
task will be retried after getting this status, but if there are
duplicate tasks that could happen. Lets plan for the worst by saying
"only process a retry if the task is currently in sending".

this way, if a duplicate task is on retry and the first task goes
through succesfully, the duplicate task will give up.
This commit is contained in:
Leo Hemsted
2021-02-18 12:02:34 +00:00
parent 90e82aff3e
commit 0088bcd98b
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/__init__.py
View File

@@ -381,7 +381,7 @@ def setup_sqlalchemy_events(app):
'host': current_app.config['NOTIFY_APP_NAME'], # worker name 'host': current_app.config['NOTIFY_APP_NAME'], # worker name
'url_rule': current_task.name, # task name 'url_rule': current_task.name, # task name
} }
# anything else. migrations possibly. # anything else. migrations possibly, or flask cli commands.
else: else:
current_app.logger.warning('Checked out sqlalchemy connection from outside of request/task') current_app.logger.warning('Checked out sqlalchemy connection from outside of request/task')
connection_record.info['request_data'] = { connection_record.info['request_data'] = {

4
app/celery/broadcast_message_tasks.py
View File

@@ -52,11 +52,11 @@ def check_provider_message_should_send(broadcast_event, provider):
""" """
current_provider_message = broadcast_event.get_provider_message(provider) current_provider_message = broadcast_event.get_provider_message(provider)
# if this is the first time a task is being executed, it won't have a provider message yet # if this is the first time a task is being executed, it won't have a provider message yet
if current_provider_message and current_provider_message.status == BroadcastProviderMessageStatus.TECHNICAL_FAILURE: if current_provider_message and current_provider_message.status != BroadcastProviderMessageStatus.SENDING:
raise CBCProxyFatalException( raise CBCProxyFatalException(
f'Cannot send broadcast_event {broadcast_event.id} ' + f'Cannot send broadcast_event {broadcast_event.id} ' +
f'to provider {provider}: ' + f'to provider {provider}: ' +
'It is already in status technical-failure' f'It is in status {current_provider_message.status}'
) )
if broadcast_event.transmitted_finishes_at < datetime.utcnow(): if broadcast_event.transmitted_finishes_at < datetime.utcnow():

13
tests/app/celery/test_broadcast_message_tasks.py
View File

@@ -701,15 +701,20 @@ def test_check_provider_message_should_send_doesnt_raise_if_newer_event_not_acke
@pytest.mark.parametrize('existing_message_status', [ @pytest.mark.parametrize('existing_message_status', [
BroadcastProviderMessageStatus.SENDING, BroadcastProviderMessageStatus.SENDING,
BroadcastProviderMessageStatus.ACK, pytest.param(
BroadcastProviderMessageStatus.ERR, BroadcastProviderMessageStatus.ACK,
marks=pytest.mark.xfail(raises=CBCProxyFatalException)
),
pytest.param(
BroadcastProviderMessageStatus.ERR,
marks=pytest.mark.xfail(raises=CBCProxyFatalException)
),
pytest.param( pytest.param(
BroadcastProviderMessageStatus.TECHNICAL_FAILURE, BroadcastProviderMessageStatus.TECHNICAL_FAILURE,
marks=pytest.mark.xfail(raises=CBCProxyFatalException) marks=pytest.mark.xfail(raises=CBCProxyFatalException)
), ),
]) ])
def test_check_provider_message_should_send_doesnt_raise_if_current_event_already_has_provider_message( def test_check_provider_message_should_send_raises_if_current_event_already_has_provider_message_not_in_sending(
sample_template, sample_template,
existing_message_status existing_message_status
): ):