Unverified Commit 0714be48 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14219 from mvdbeek/revoke_behind_enable_celery_tasks_flag 

[22.05] Put revoke for canceling upload task behind ``enable_celery_tasks`` flag
parents f19d0c1e 1ff58b61

lib/galaxy/jobs/handler.py

+2 −2
Original line number Diff line number Diff line
@@ -1198,7 +1198,7 @@ class JobHandlerStopQueue(Monitors): 




class DefaultJobDispatcher:

    def __init__(self, app):

    def __init__(self, app: MinimalManagerApp):

        self.app = app

        self.job_runners = self.app.job_config.get_job_runner_plugins(self.app.config.server_name)

        # Once plugins are loaded, all job destinations that were created from
@@ -1260,7 +1260,7 @@ class DefaultJobDispatcher: 
        # The runner name is not set until the job has started.

        # If we're stopping a task, then the runner_name may be

        # None, in which case it hasn't been scheduled.

        if job.tool_id == "__DATA_FETCH__":

        if self.app.config.enable_celery_tasks and job.tool_id == "__DATA_FETCH__":

            from galaxy.celery import celery_app



            celery_app.control.revoke(job.job_runner_external_id)