From 19e56b41968f9a90bda6c7454cce6bf82a2823aa Mon Sep 17 00:00:00 2001
From: Jessica Severin <jessica@ebi.ac.uk>
Date: Thu, 22 Sep 2005 18:35:06 +0000
Subject: [PATCH] reverted back to original worker. New code to catch
exceptions at the job level while not killing worker caused catastrophic
hammering of analysis_job table if there was a problem in the code where by
all jobs fail.
---
modules/Bio/EnsEMBL/Hive/Worker.pm | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/modules/Bio/EnsEMBL/Hive/Worker.pm b/modules/Bio/EnsEMBL/Hive/Worker.pm
index 35e9ba30d..24f254f4a 100755
--- a/modules/Bio/EnsEMBL/Hive/Worker.pm
+++ b/modules/Bio/EnsEMBL/Hive/Worker.pm
@@ -418,21 +418,15 @@ sub run
}
foreach my $job (@{$jobs}) {
- eval {
- $self->redirect_job_output($job);
- $self->run_module_with_job($job);
- $self->close_and_update_job_output($job);
-
- $self->queen->worker_register_job_done($self, $job);
- $self->work_done($self->work_done + 1);
- };
- if($@) {
- #job threw an exception so it had a problem
- printf("job %d failed with exception: $@\n", $job->dbID);
- $self->queen->db->get_AnalysisJobAdaptor->reset_dead_job_by_dbID($job->dbID);
- }
- }
+ $self->redirect_job_output($job);
+ $self->run_module_with_job($job);
+ $self->close_and_update_job_output($job);
+
+ $self->queen->worker_register_job_done($self, $job);
+
+ $self->{'_work_done'}++;
+ }
my $batch_end = time() * 1000;
#printf("batch start:%f end:%f\n", $batch_start, $batch_end);
$self->db->get_AnalysisStatsAdaptor->
--
GitLab