Revert increased timeout for reporting worker

This reverts commit 603acc8b1e +
This reverts commit edad1c9a21.

The cause of the slowness was fixed in [1] and since [2] we now
have data to prove it: each query to get the data is taking under
5 minutes, so it's safe to lower the timeout again.

[1]: https://github.com/alphagov/notifications-api/pull/3417
[2]: https://github.com/alphagov/notifications-api/pull/3437
This commit is contained in:
Ben Thorner
2022-01-25 12:50:43 +00:00
parent 68981a8b0d
commit 0d71ee69f0
2 changed files with 1 additions and 2 deletions

View File

@@ -145,7 +145,7 @@ class Config(object):
SQLALCHEMY_POOL_SIZE = int(os.environ.get('SQLALCHEMY_POOL_SIZE', 5)) SQLALCHEMY_POOL_SIZE = int(os.environ.get('SQLALCHEMY_POOL_SIZE', 5))
SQLALCHEMY_POOL_TIMEOUT = 30 SQLALCHEMY_POOL_TIMEOUT = 30
SQLALCHEMY_POOL_RECYCLE = 300 SQLALCHEMY_POOL_RECYCLE = 300
SQLALCHEMY_STATEMENT_TIMEOUT = int(os.environ.get('SQLALCHEMY_STATEMENT_TIMEOUT', 1200)) SQLALCHEMY_STATEMENT_TIMEOUT = 1200
PAGE_SIZE = 50 PAGE_SIZE = 50
API_PAGE_SIZE = 250 API_PAGE_SIZE = 250
TEST_MESSAGE_FILENAME = 'Test message' TEST_MESSAGE_FILENAME = 'Test message'

View File

@@ -57,7 +57,6 @@
'notify-delivery-worker-reporting': { 'notify-delivery-worker-reporting': {
'additional_env_vars': { 'additional_env_vars': {
'CELERYD_PREFETCH_MULTIPLIER': 1, 'CELERYD_PREFETCH_MULTIPLIER': 1,
'SQLALCHEMY_STATEMENT_TIMEOUT': 7200
} }
}, },
'notify-delivery-worker-priority': {}, 'notify-delivery-worker-priority': {},