Skip to content

Commit d13a617

Browse files
author
Andrei Neagu
committed
fixed issue with task not being cancelled
1 parent 76efb81 commit d13a617

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

packages/service-library/src/servicelib/deferred_tasks/_deferred_manager.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -585,20 +585,19 @@ async def _fs_handle_manually_cancelled( # pylint:disable=method-hidden
585585
self, task_uid: TaskUID
586586
) -> None:
587587
_log_state(TaskState.MANUALLY_CANCELLED, task_uid)
588-
_logger.info("Attempting to cancel task_uid '%s'", task_uid)
588+
_logger.info("Recevied a cancel request for task_uid '%s'", task_uid)
589589

590590
task_schedule = await self.__get_task_schedule(
591591
task_uid, expected_state=TaskState.MANUALLY_CANCELLED
592592
)
593593

594-
if task_schedule.state == TaskState.WORKER:
595-
run_was_cancelled = self._worker_tracker.cancel_run(task_uid)
596-
if not run_was_cancelled:
597-
_logger.debug(
598-
"Currently not handling task related to '%s'. Did not cancel it.",
599-
task_uid,
600-
)
601-
return
594+
run_was_cancelled = self._worker_tracker.cancel_run(task_uid)
595+
if not run_was_cancelled:
596+
_logger.debug(
597+
"Currently not handling task related to '%s'. Did not cancel it.",
598+
task_uid,
599+
)
600+
return
602601

603602
_logger.info("Found and cancelled run for '%s'", task_uid)
604603
await self.__remove_task(task_uid, task_schedule)

0 commit comments

Comments
 (0)