opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

check_for_entry_points() more agressively in the condor job runner

Browse Source
This commit is contained in:
Bjoern Gruening
2019-11-06 22:17:28 +01:00
parent 1b776b5b0b
commit 61b9aee3ff
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/condor.py
+3 -4
View File
@@ -177,6 +177,9 @@ class CondorJobRunner(AsynchronousJobRunner):
galaxy_id_tag = cjs.job_wrapper.get_id_tag()
try:
if os.stat(cjs.user_log).st_size == cjs.user_log_size:
if cjs.job_wrapper.tool.tool_type == 'interactive':
# If running, check for entry points...
cjs.job_wrapper.check_for_entry_points()
new_watched.append(cjs)
continue
s1, s4, s7, s5, s9, log_size = summarize_condor_log(cjs.user_log, job_id)
@@ -192,10 +195,6 @@ class CondorJobRunner(AsynchronousJobRunner):
self.work_queue.put((self.fail_job, cjs))
continue
if job_running:
# If running, check for entry points...
cjs.job_wrapper.check_for_entry_points()
if job_running and not cjs.running:
log.debug("(%s/%s) job is now running" % (galaxy_id_tag, job_id))
cjs.job_wrapper.change_state(model.Job.states.RUNNING)