send emails using 3 new queues #1997
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
This was referenced Oct 10, 2023
jimleroyer
reviewed
Oct 11, 2023
scripts/run_celery_no_sending.sh
Outdated
| @@ -0,0 +1,10 @@ | |||
| #!/bin/sh | |||
There was a problem hiding this comment.
run_celery_core_tasks as an alternative name maybe?
There was a problem hiding this comment.
yeah, that's less clunky!
jimleroyer
reviewed
Oct 11, 2023
| (1, NORMAL, QueueNames.SEND_EMAIL_LOW), # autoswitch to bulk queue if bulk threshold is met. | ||
| (1_000, NORMAL, QueueNames.SEND_EMAIL_MEDIUM), # keep normal priority | ||
| (1, BULK, QueueNames.SEND_EMAIL_LOW), # keep bulk priority | ||
| (1_000, BULK, QueueNames.SEND_EMAIL_MEDIUM), # autoswitch to normal queue if normal threshold is met. |
jimleroyer
reviewed
Oct 11, 2023
| @@ -1103,7 +1103,7 @@ def test_process_rows_works_without_key_type( | |||
| "to": "recip", | |||
| "row_number": "row_num", | |||
| "personalisation": {"foo": "bar"}, | |||
| "queue": QueueNames.SEND_SMS_MEDIUM if template_type == SMS_TYPE else "send-{}-tasks".format(template_type), | |||
| "queue": QueueNames.SEND_SMS_MEDIUM if template_type == SMS_TYPE else QueueNames.SEND_EMAIL_MEDIUM, | |||
There was a problem hiding this comment.
Wouldn't that change trigger failures for SMS notification type test parameters? 🤔
There was a problem hiding this comment.
the SMS ones are being set to QueueNames.SEND_SMS_MEDIUM as before. Previously the else really should have been just else "send-email-tasks" since there's no letter type in the test parameters.
There was a problem hiding this comment.
oh I read that change incorrectly, it's all orthogonal now and good
jimleroyer
reviewed
Oct 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary | Résumé
https://app.zenhub.com/workspaces/notify-planning-core-6411dfb7c95fb80014e0cab0/issues/gh/cds-snc/notification-planning-core/4
Move email sending (ie
deliver_email()) to their own queues (send-email-high, send-email-medium, send-email-low)note that these queues are still consumed by the same celery workers as the current email sending queues.
This PR is based on the analogous SMS work done in this PR.
Test instructions | Instructions pour tester la modification
Release Instructions | Instructions pour le déploiement