From 9e5419f58c2af16d4cc6e8ece79c61f86a38b6cf Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 8 Jun 2016 13:46:50 +0100 Subject: [PATCH] Delay import of DrmaaSessionFactory after runner initialization Fix issue #2463, i.e. the regression introduced in #2102 by which Galaxy no longer respects in config/job_conf.xml , preventing the use of multiple drmaa runners. --- lib/galaxy/jobs/runners/drmaa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/runners/drmaa.py b/lib/galaxy/jobs/runners/drmaa.py index 0b9e3a995aa..df4492164c1 100644 --- a/lib/galaxy/jobs/runners/drmaa.py +++ b/lib/galaxy/jobs/runners/drmaa.py @@ -15,7 +15,6 @@ from galaxy.jobs import JobDestination from galaxy.jobs.handler import DEFAULT_JOB_PUT_FAILURE_MESSAGE from galaxy.jobs.runners import AsynchronousJobState, AsynchronousJobRunner from galaxy.util import asbool -from pulsar.managers.util.drmaa import DrmaaSessionFactory drmaa = None @@ -62,6 +61,7 @@ class DRMAAJobRunner( AsynchronousJobRunner ): 'feature, please install it or correct the ' 'following error:\n%s: %s' % (exc.__class__.__name__, str(exc))) + from pulsar.managers.util.drmaa import DrmaaSessionFactory # Subclasses may need access to state constants self.drmaa_job_states = drmaa.JobState