2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2a1459ef5bc4/ Changeset: 2a1459ef5bc4 Branch: stable User: natefoo Date: 2013-06-05 21:25:19 Summary: Fix a couple bugs in job recovery in the Condor runner found by Branden Timm. Affected #: 1 file diff -r 47b86d6a9077facb54804576be49ca545d18bd4e -r 2a1459ef5bc402c585f24c904e0d5ad82a7326db lib/galaxy/jobs/runners/condor.py --- a/lib/galaxy/jobs/runners/condor.py +++ b/lib/galaxy/jobs/runners/condor.py @@ -232,6 +232,7 @@ """Recovers jobs stuck in the queued/running state when Galaxy started""" # TODO Check if we need any changes here job_id = job.get_job_runner_external_id() + galaxy_id_tag = job_wrapper.get_id_tag() if job_id is None: self.put( job_wrapper ) return @@ -252,7 +253,7 @@ cjs.running = False self.monitor_queue.put( cjs ) - def __old_state_paths( self, cjs, job ): + def __old_state_paths( self, cjs ): """For recovery of jobs started prior to standardizing the naming of files in the AsychronousJobState object """ https://bitbucket.org/galaxy/galaxy-central/commits/af91c734dbb7/ Changeset: af91c734dbb7 User: natefoo Date: 2013-06-05 21:25:30 Summary: Merge stable Affected #: 1 file diff -r 89d391f23c1bfb9a745b03095dbcf0459b830e19 -r af91c734dbb76b8c0e3166c7471370f9ba8260b5 lib/galaxy/jobs/runners/condor.py --- a/lib/galaxy/jobs/runners/condor.py +++ b/lib/galaxy/jobs/runners/condor.py @@ -232,6 +232,7 @@ """Recovers jobs stuck in the queued/running state when Galaxy started""" # TODO Check if we need any changes here job_id = job.get_job_runner_external_id() + galaxy_id_tag = job_wrapper.get_id_tag() if job_id is None: self.put( job_wrapper ) return @@ -252,7 +253,7 @@ cjs.running = False self.monitor_queue.put( cjs ) - def __old_state_paths( self, cjs, job ): + def __old_state_paths( self, cjs ): """For recovery of jobs started prior to standardizing the naming of files in the AsychronousJobState object """ 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.