(multi-meadow scheduler) restrict the set of analyses that a worker with a...

(multi-meadow scheduler) restrict the set of analyses that a worker with a given meadow_type can specialize into

modules/Bio/EnsEMBL/Hive/DBSQL/AnalysisStatsAdaptor.pm

@@ -79,10 +79,13 @@ sub fetch_by_analysis_id {
 }
 
 
-sub fetch_all_by_suitability_rc_id {
-    my ($self, $resource_class_id) = @_;
+sub fetch_all_by_suitability_rc_id_meadow_type {
+    my ($self, $resource_class_id, $meadow_type) = @_;
 
-    my $join = [[['analysis_base', 'a'], " ast.analysis_id=a.analysis_id ".( $resource_class_id ? "AND a.resource_class_id=$resource_class_id " : '') ]];
+    my $join = [[ ['analysis_base', 'a'], " ast.analysis_id=a.analysis_id "
+                                                .( $resource_class_id ? "AND a.resource_class_id=$resource_class_id " : '')
+                                                .( $meadow_type       ? "AND (a.meadow_type IS NULL OR a.meadow_type='$meadow_type') " : '')
+               ]];
 
         # the ones that clearly have work to do:
         #

modules/Bio/EnsEMBL/Hive/Queen.pm

@@ -257,7 +257,7 @@ sub specialize_new_worker {
 
     } else {    # probably scheduled by beekeeper.pl
 
-        $stats = $self->suggest_analysis_to_specialize_by_rc_id($worker->resource_class_id)
+        $stats = $self->suggest_analysis_to_specialize_by_rc_id_meadow_type($worker->resource_class_id, $worker->meadow_type)
             or die "Queen failed to pick an analysis for the worker";
 
         print "Queen picked analysis with dbID=".$stats->analysis_id." for the worker\n";
@@ -838,11 +838,12 @@ sub register_all_workers_dead {
 }
 
 
-sub suggest_analysis_to_specialize_by_rc_id {
+sub suggest_analysis_to_specialize_by_rc_id_meadow_type {
     my $self                = shift;
     my $rc_id               = shift;
+    my $meadow_type         = shift;
 
-    my @suitable_analyses = @{ $self->db->get_AnalysisStatsAdaptor->fetch_all_by_suitability_rc_id( $rc_id ) };
+    my @suitable_analyses = @{ $self->db->get_AnalysisStatsAdaptor->fetch_all_by_suitability_rc_id_meadow_type( $rc_id, $meadow_type ) };
 
     foreach my $stats (@suitable_analyses) {
 

modules/Bio/EnsEMBL/Hive/Scheduler.pm

@@ -64,7 +64,7 @@ sub schedule_workers {
 
     my @suitable_analyses   = $filter_analysis
                                 ? ( $filter_analysis->stats )
-                                : @{ $queen->db->get_AnalysisStatsAdaptor->fetch_all_by_suitability_rc_id() };
+                                : @{ $queen->db->get_AnalysisStatsAdaptor->fetch_all_by_suitability_rc_id_meadow_type() };
 
     unless(@suitable_analyses) {
         print "Scheduler could not find any suitable analyses to start with\n";