Skip to content
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

fix(monitoring): exclude locked and future scheduled tasks from monitoring #21

Merged
merged 1 commit into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions task_processor/monitoring.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from django.utils import timezone

from task_processor.models import Task


def get_num_waiting_tasks() -> int:
return Task.objects.filter(
num_failures__lt=3,
completed=False,
scheduled_for__lt=timezone.now(),
is_locked=False,
).count()
6 changes: 3 additions & 3 deletions task_processor/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
from rest_framework.permissions import IsAdminUser, IsAuthenticated
from rest_framework.response import Response

from task_processor.models import Task
from task_processor.monitoring import get_num_waiting_tasks
from task_processor.serializers import MonitoringSerializer


@swagger_auto_schema(method="GET", responses={200: MonitoringSerializer()})
@api_view(http_method_names=["GET"])
@permission_classes([IsAuthenticated, IsAdminUser])
def monitoring(request, **kwargs):
waiting_tasks = Task.objects.filter(num_failures__lt=3, completed=False).count()
return Response(
data={"waiting": waiting_tasks}, headers={"Content-Type": "application/json"}
data={"waiting": get_num_waiting_tasks()},
headers={"Content-Type": "application/json"},
)
38 changes: 38 additions & 0 deletions tests/unit/task_processor/test_unit_task_processor_monitoring.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
from datetime import timedelta

from django.utils import timezone

from task_processor.models import Task
from task_processor.monitoring import get_num_waiting_tasks


def test_get_num_waiting_tasks(db: None) -> None:
# Given
now = timezone.now()

# a task that is waiting
Task.objects.create(task_identifier="tasks.test_task")

# a task that is scheduled for the future
Task.objects.create(
task_identifier="tasks.test_task", scheduled_for=now + timedelta(days=1)
)

# and a task that has been completed
Task.objects.create(
task_identifier="tasks.test_task",
scheduled_for=now - timedelta(days=1),
completed=True,
)

# and a task that has been locked for processing
Task.objects.create(
task_identifier="tasks.test_task",
is_locked=True,
)

# When
num_waiting_tasks = get_num_waiting_tasks()

# Then
assert num_waiting_tasks == 1