1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/4a95ae9a26d9/ changeset: 4a95ae9a26d9 user: natefoo date: 2012-11-27 18:18:08 summary: Handle invalid job ids in the drmaa runner. affected #: 1 file
diff -r 9bf411ee2476c21c4c3fce6a5bbabf508f7505ff -r 4a95ae9a26d96f0dc9a0fe3b083a2c7b99b0466b lib/galaxy/jobs/runners/drmaa.py --- a/lib/galaxy/jobs/runners/drmaa.py +++ b/lib/galaxy/jobs/runners/drmaa.py @@ -293,6 +293,7 @@ galaxy_job_id = drm_job_state.job_wrapper.job_id old_state = drm_job_state.old_state try: + assert job_id not in ( None, 'None' ), 'Invalid job id: %s' % job_id state = self.ds.jobStatus( job_id ) # InternalException was reported to be necessary on some DRMs, but # this could cause failures to be detected as completion! Please @@ -308,7 +309,7 @@ continue except Exception, e: # so we don't kill the monitor thread - log.exception("(%s/%s) Unable to check job status" % ( galaxy_job_id, job_id ) ) + log.exception("(%s/%s) Unable to check job status: %s" % ( galaxy_job_id, job_id, str( e ) ) ) log.warning("(%s/%s) job will now be errored" % ( galaxy_job_id, job_id ) ) drm_job_state.fail_message = "Cluster could not complete job" self.work_queue.put( ( 'fail', drm_job_state ) )
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.