From 3ac37643403479b44523c5fdc3d22dd09b189633 Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Mon, 6 Jul 2026 02:23:05 +0800 Subject: [PATCH] =?UTF-8?q?S84=20=E5=8F=96=E6=B6=88=E8=AF=AD=E4=B9=89?= =?UTF-8?q?=E5=8A=A0=E5=9B=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/services/queue_service.py | 31 +++++++++++++++++++++++++++--- backend/services/worker_service.py | 16 +++++++++++++-- tests/test_queue_service.py | 13 +++++++++++++ tests/test_worker_service.py | 17 ++++++++++++++++ 4 files changed, 72 insertions(+), 5 deletions(-) diff --git a/backend/services/queue_service.py b/backend/services/queue_service.py index c4f185f..7bc4d39 100644 --- a/backend/services/queue_service.py +++ b/backend/services/queue_service.py @@ -2,6 +2,7 @@ from __future__ import annotations +from datetime import datetime, timezone from typing import Any from uuid import uuid4 @@ -123,16 +124,33 @@ class QueueService: return None return self.repository.get_by_idempotency_key(normalized_key) - def cancel_job(self, task_id: str, ctx: RequestContext) -> GenerationTask: + def cancel_job(self, task_id: str, ctx: RequestContext, *, reason: str | None = None) -> GenerationTask: before = self.get_job(task_id) - if before.status in {"completed", "succeeded", "cancelled"}: + if before.status == "cancelled": + return before + if before.status in {"completed", "succeeded"}: raise ApiError( ErrorCode.TASK_NOT_CANCELABLE, "task cannot be cancelled from current status", {"task_id": task_id, "status": before.status}, ) self._validate_task_status_transition(before.status, "cancelled") - after = self.repository.update(task_id, {"status": "cancelled"}) + after = self.repository.update( + task_id, + { + "status": "cancelled", + "error_message": _optional_text(reason) or before.error_message, + "metadata": { + **before.metadata, + "cancellation": { + "requested_by": ctx.actor_id or "system", + "requested_at": _now(), + "reason": _optional_text(reason) or "cancelled", + "previous_status": before.status, + }, + }, + }, + ) if after is None: raise ApiError(ErrorCode.RESOURCE_NOT_FOUND, "task not found", {"task_id": task_id}) self.audit_service.record( @@ -146,6 +164,9 @@ class QueueService: self._publish_status_change(before, after) return after + def is_cancelled(self, task_id: str) -> bool: + return self.get_job(task_id).status == "cancelled" + def retry_job(self, task_id: str, ctx: RequestContext) -> GenerationTask: before = self.get_job(task_id) if before.status not in {"failed", "dead_letter", "cancelled"}: @@ -273,6 +294,10 @@ def new_task_id() -> str: return f"task_{uuid4().hex}" +def _now() -> str: + return datetime.now(timezone.utc).isoformat() + + def _optional_text(value: Any) -> str | None: if value is None: return None diff --git a/backend/services/worker_service.py b/backend/services/worker_service.py index 82bf8dd..15888f8 100644 --- a/backend/services/worker_service.py +++ b/backend/services/worker_service.py @@ -73,6 +73,15 @@ class QueueWorker: return WorkerRunResult(worker_id=self.worker_id, status="idle") try: update = _normalize_update(self.handler(task)) + latest = self.queue_service.get_job(task.task_id) + if latest.status == "cancelled": + return WorkerRunResult( + worker_id=self.worker_id, + status="cancelled", + task_id=latest.task_id, + processed=1, + error_message=latest.error_message, + ) completed = self.queue_service.update_task( task.task_id, { @@ -105,10 +114,10 @@ class QueueWorker: failed = self._mark_failed(task, exc, ctx) return WorkerRunResult( worker_id=self.worker_id, - status="failed", + status=failed.status, task_id=failed.task_id, processed=1, - failed=1, + failed=1 if failed.status == "failed" else 0, error_message=failed.error_message, ) @@ -186,6 +195,9 @@ class QueueWorker: return None def _mark_failed(self, task: GenerationTask, exc: Exception, ctx: RequestContext) -> GenerationTask: + latest = self.queue_service.get_job(task.task_id) + if latest.status == "cancelled": + return latest message = _safe_error_message(exc) return self.queue_service.update_task( task.task_id, diff --git a/tests/test_queue_service.py b/tests/test_queue_service.py index 5aec397..4113cc0 100644 --- a/tests/test_queue_service.py +++ b/tests/test_queue_service.py @@ -62,6 +62,19 @@ class QueueServiceTests(unittest.TestCase): self.assertIsNone(first.idempotency_key) self.assertIsNone(second.idempotency_key) + def test_cancel_job_records_actor_reason_and_is_idempotent(self): + task = self.queue_service.create_task({"status": "running", "metadata": {"worker_attempt": 1}}, self.ctx) + + cancelled = self.queue_service.cancel_job(task.task_id, self.ctx, reason="user stopped") + repeated = self.queue_service.cancel_job(task.task_id, self.ctx, reason="ignored") + + self.assertEqual(cancelled.status, "cancelled") + self.assertEqual(repeated.task_id, task.task_id) + self.assertEqual(repeated.metadata["cancellation"]["reason"], "user stopped") + self.assertEqual(cancelled.metadata["cancellation"]["requested_by"], "user_001") + self.assertEqual(cancelled.metadata["cancellation"]["previous_status"], "running") + self.assertTrue(self.queue_service.is_cancelled(task.task_id)) + def test_dead_letter_batch_limits_are_normalized(self): for index in range(3): self.queue_service.create_task({"status": "failed", "error_message": f"failure {index}"}, self.ctx) diff --git a/tests/test_worker_service.py b/tests/test_worker_service.py index 530d680..cab1c66 100644 --- a/tests/test_worker_service.py +++ b/tests/test_worker_service.py @@ -95,6 +95,23 @@ class QueueWorkerTests(unittest.TestCase): self.assertEqual(completed.status, "succeeded") self.assertTrue(completed.result["async"]) + def test_worker_does_not_overwrite_task_cancelled_during_handler(self): + task = self.queue_service.create_task({"status": "queued"}, self.ctx) + + def handler(claimed): + self.queue_service.cancel_job(claimed.task_id, self.ctx, reason="stop during run") + return {"result": {"late_result": True}} + + worker = QueueWorker(self.queue_service, handler, worker_id="cancel-aware-worker") + + result = worker.run_once(self.ctx) + + self.assertEqual(result.status, "cancelled") + cancelled = self.queue_service.get_job(task.task_id) + self.assertEqual(cancelled.status, "cancelled") + self.assertNotIn("late_result", cancelled.result) + self.assertEqual(cancelled.metadata["cancellation"]["reason"], "stop during run") + def test_run_batch_stops_after_idle(self): for index in range(2): self.queue_service.create_task({"status": "queued", "request": {"index": index}}, self.ctx)