-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/dpm 174 data hub api investigate rq health check #5266
Merged
marijnkampf
merged 6 commits into
migration-deploy
from
feature/DPM-174-Data-Hub-API-Investigate-RQ-health-check
Mar 21, 2024
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ac3af39
Include long and short running queues in health check
marijnkampf 3fb1e57
Fix and extend test coverage
marijnkampf 8404a36
Avoid flakey test with slashes.
marijnkampf a37bd3b
Refactor rq health check into Command
marijnkampf f2959b1
Revert to original
marijnkampf c69f824
Extend test coverage
marijnkampf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import sys | ||
|
||
from functools import reduce | ||
from logging import getLogger | ||
from operator import concat | ||
|
||
from django.conf import settings | ||
from django.core.management.base import BaseCommand | ||
from redis import Redis | ||
from rq import Worker | ||
|
||
|
||
logger = getLogger(__name__) | ||
|
||
|
||
class Command(BaseCommand): | ||
help = 'RQ Health Check' | ||
|
||
def add_arguments(self, parser): | ||
"""Define extra arguments.""" | ||
parser.add_argument( | ||
'--queue', | ||
type=str, | ||
help='Name of the queue to perform health check on.', | ||
) | ||
|
||
def handle(self, *args, **options): | ||
if options['queue']: | ||
queue = str(options['queue']) | ||
redis = Redis.from_url(settings.REDIS_BASE_URL) | ||
workers = Worker.all(connection=redis) | ||
queue_names = reduce(concat, [worker.queue_names() for worker in workers], []) | ||
missing_queues = set([queue]) - set(queue_names) | ||
|
||
if missing_queues: | ||
logger.error(f'RQ queue not running: {missing_queues}') | ||
sys.exit(1) | ||
logger.info('OK') | ||
sys.exit(0) | ||
|
||
logger.error('Nothing checked! Please provide --queue parameter') | ||
sys.exit(1) |
63 changes: 63 additions & 0 deletions
63
datahub/core/test/management/commands/test_rq_health_check.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
import logging | ||
from unittest import mock | ||
from unittest.mock import patch | ||
|
||
import pytest | ||
|
||
from django.core.management import call_command | ||
|
||
|
||
class MockWorker: | ||
""" | ||
Mock queue names object returned by worker | ||
""" | ||
|
||
queue_name = '' | ||
|
||
def __init__(self, queue_name, *args, **kwargs): | ||
self.queue_name = queue_name | ||
|
||
def queue_names(self): | ||
return self.queue_name | ||
|
||
|
||
def test_rq_health_check_ok(): | ||
logger = logging.getLogger('datahub.core.management.commands.rq_health_check') | ||
with patch( | ||
'datahub.core.management.commands.rq_health_check.Worker.all', | ||
return_value=[MockWorker(['short-running']), MockWorker(['long-running'])], | ||
): | ||
with mock.patch.object(logger, 'info') as mock_info: | ||
with pytest.raises(SystemExit) as exception_info: | ||
call_command('rq_health_check', '--queue=short-running') | ||
|
||
assert exception_info.value.code == 0 | ||
assert 'OK' in str(mock_info.call_args_list) | ||
assert mock_info.call_count == 1 | ||
|
||
|
||
def test_rq_health_check_rq_not_running(): | ||
logger = logging.getLogger('datahub.core.management.commands.rq_health_check') | ||
with patch( | ||
'datahub.core.management.commands.rq_health_check.Worker.all', | ||
return_value=[MockWorker(['long-running'])], | ||
): | ||
with mock.patch.object(logger, 'error') as mock_error: | ||
with pytest.raises(SystemExit) as exception_info: | ||
call_command('rq_health_check', '--queue=short-running') | ||
|
||
assert exception_info.value.code == 1 | ||
assert "RQ queue not running: {\'short-running\'}" in str(mock_error.call_args_list) | ||
assert mock_error.call_count == 1 | ||
|
||
|
||
def test_command_called_without_parameter(): | ||
logger = logging.getLogger('datahub.core.management.commands.rq_health_check') | ||
with mock.patch.object(logger, 'error') as mock_error: | ||
with pytest.raises(SystemExit) as exception_info: | ||
call_command('rq_health_check') | ||
|
||
assert exception_info.value.code == 1 | ||
assert 'Nothing checked! Please provide --queue parameter' \ | ||
in str(mock_error.call_args_list) | ||
assert mock_error.call_count == 1 |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using set literal syntax is simpler and computationally quicker. Explained here.