diff --git a/cylc/flow/task_pool.py b/cylc/flow/task_pool.py index 79cc07f158..87009a00fd 100644 --- a/cylc/flow/task_pool.py +++ b/cylc/flow/task_pool.py @@ -2179,7 +2179,7 @@ def _force_trigger(self, itask: 'TaskProxy', on_resume: bool = False): itask.state_reset(is_queued=True) self.data_store_mgr.delta_task_state(itask) - elif self.task_queue_mgr.force_release_task(itask): + elif self.task_queue_mgr.remove_task(itask): # else release it from the queue to run now itask.state_reset(is_queued=False) self.data_store_mgr.delta_task_state(itask) diff --git a/cylc/flow/task_queues/__init__.py b/cylc/flow/task_queues/__init__.py index b6d2f8a824..f8c1672587 100644 --- a/cylc/flow/task_queues/__init__.py +++ b/cylc/flow/task_queues/__init__.py @@ -68,14 +68,6 @@ def remove_task(self, itask: 'TaskProxy') -> bool: """Try to remove a task from the queues. Return True if done.""" raise NotImplementedError - @abstractmethod - def force_release_task(self, itask: 'TaskProxy') -> bool: - """Remove a task from whichever queue it belongs to. - - Return True if released, else False - """ - raise NotImplementedError - @abstractmethod def adopt_tasks(self, orphans: List[str]) -> None: """Adopt tasks with defs removed by scheduler reload or restart.""" diff --git a/cylc/flow/task_queues/independent.py b/cylc/flow/task_queues/independent.py index fd904334c7..5cf2215918 100644 --- a/cylc/flow/task_queues/independent.py +++ b/cylc/flow/task_queues/independent.py @@ -151,13 +151,6 @@ def remove_task(self, itask: 'TaskProxy') -> bool: """Try to remove a task from the queues. Return True if done.""" return any(queue.remove(itask) for queue in self.queues.values()) - def force_release_task(self, itask: 'TaskProxy') -> bool: - """Remove a task from whichever queue it belongs to. - - Return True if released, else False. - """ - return self.remove_task(itask) - def adopt_tasks(self, orphans: List[str]) -> None: """Adopt orphaned tasks to the default group.""" self.queues[self.Q_DEFAULT].adopt(orphans)