Linting issues

Close #3821
pulp · Apr 24, 2024 · d51fdb5 · d51fdb5
1 parent 6ff90c6
commit d51fdb5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/pulpcore/tasking/_util.py b/pulpcore/tasking/_util.py
@@ -7,9 +7,7 @@
 import sys
 import threading
 import time
-from datetime import datetime, timedelta
 from gettext import gettext as _
-from opentelemetry.metrics import get_meter, Observation
 
 from django.conf import settings
 from django.db import connection, transaction
@@ -28,7 +26,6 @@
 from pulpcore.constants import TASK_FINAL_STATES, TASK_STATES, VAR_TMP_PULP
 from pulpcore.exceptions import AdvisoryLockError
 from pulpcore.tasking.tasks import dispatch, execute_task
-from pulpcore.app.models import Worker, Task
 
 _logger = logging.getLogger(__name__)
 

diff --git a/pulpcore/tasking/worker.py b/pulpcore/tasking/worker.py
@@ -426,12 +426,33 @@ def record_unblocked_waiting_tasks_metric(self):
                             unit="seconds",
                         )
 
-                        unblocked_waiting_tasks = Task.objects.filter(unblocked_at__isnull=False, started_at__isnull=True)
-                        unblocked_waiting_tasks_annotated = unblocked_waiting_tasks.annotate(unblocked_for=Value(timezone.now()) - F("unblocked_at"))
-                        unblocked_waiting_tasks_aggregated = unblocked_waiting_tasks_annotated.aggregate(longest_age=Coalesce(Max("unblocked_for"), timezone.timedelta(0)), unblocked_count=Count(Value(1)), unblocked_count_gte_threshold=Count(Case(When(unblocked_for__gte=Value(timezone.timedelta(seconds=5)), then=1))))
+                        unblocked_waiting_tasks = Task.objects.filter(
+                            unblocked_at__isnull=False, started_at__isnull=True
+                        )
+                        unblocked_waiting_tasks_annotated = unblocked_waiting_tasks.annotate(
+                            unblocked_for=Value(timezone.now()) - F("unblocked_at")
+                        )
+                        unblocked_waiting_tasks_aggregated = (
+                            unblocked_waiting_tasks_annotated.aggregate(
+                                longest_age=Coalesce(Max("unblocked_for"), timezone.timedelta(0)),
+                                unblocked_count=Count(Value(1)),
+                                unblocked_count_gte_threshold=Count(
+                                    Case(
+                                        When(
+                                            unblocked_for__gte=Value(timezone.timedelta(seconds=5)),
+                                            then=1,
+                                        )
+                                    )
+                                ),
+                            )
+                        )
 
-                        unblocked_waiting_tasks_meter.set(unblocked_waiting_tasks_aggregated["unblocked_count"])
-                        longest_waiting_tasks_meter.set(unblocked_waiting_tasks_aggregated["longest_age"].seconds)
+                        unblocked_waiting_tasks_meter.set(
+                            unblocked_waiting_tasks_aggregated["unblocked_count"]
+                        )
+                        longest_waiting_tasks_meter.set(
+                            unblocked_waiting_tasks_aggregated["longest_age"].seconds
+                        )
                 except AdvisoryLockError:
                     pass
 

diff --git a/pulpcore/tests/functional/api/test_tasking.py b/pulpcore/tests/functional/api/test_tasking.py
@@ -4,10 +4,6 @@
 import pytest
 import subprocess
 import time
-from time import sleep
-
-import requests
-import os
 
 from aiohttp import BasicAuth
 from urllib.parse import urljoin
@@ -356,7 +352,9 @@ def test_task_version_prevent_pickup(dispatch_task, pulpcore_bindings):
         pulpcore_bindings.TasksApi.tasks_cancel(task_href, {"state": "canceled"})
 
 
-def test_emmiting_unblocked_task_telemetry(dispatch_task, pulpcore_bindings, received_otel_metrics, pulpcore_settings):
+def test_emmiting_unblocked_task_telemetry(
+    dispatch_task, pulpcore_bindings, received_otel_metrics, pulpcore_settings
+):
     if not pulpcore_settings.PULP_OTEL_ENABLED:
         pytest.skip("Need PULP_OTEL_ENABLED to run this test.")
 
@@ -366,9 +364,7 @@ def test_emmiting_unblocked_task_telemetry(dispatch_task, pulpcore_bindings, rec
 
     resource = str(uuid4())
 
-    dispatch_task(
-        "pulpcore.app.tasks.test.sleep", args=(600,), exclusive_resources=[resource]
-    )
+    dispatch_task("pulpcore.app.tasks.test.sleep", args=(600,), exclusive_resources=[resource])
     task_href = dispatch_task(
         "pulpcore.app.tasks.test.sleep", args=(0,), exclusive_resources=[resource]
     )