From ce90b2da277113516480fe74d075ac975f93c828 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 21 Apr 2015 11:03:19 -0400 Subject: [PATCH] Reduce default step count for beta workflow scheduling to 40. Was going to do this once per release and forgot to. This scheduler has been used in production and seems to work properly. --- config/galaxy.ini.sample | 2 +- lib/galaxy/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/galaxy.ini.sample b/config/galaxy.ini.sample index d0b176c842e..2d9b12f40a5 100644 --- a/config/galaxy.ini.sample +++ b/config/galaxy.ini.sample @@ -860,7 +860,7 @@ use_interactive = True # scheduling). # Workflows containing more than the specified number of steps will always use # the Galaxy's beta workflow scheduling. -#force_beta_workflow_scheduled_min_steps=250 +#force_beta_workflow_scheduled_min_steps=40 # Switch to using Galaxy's beta workflow scheduling for all workflows involving # ccollections. #force_beta_workflow_scheduled_for_collections=False diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index fc011af9fea..401874f0221 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -231,7 +231,7 @@ class Configuration( object ): # be someday - the following two properties can also be used to force this # behavior in under conditions - namely for workflows that have a minimum # number of steps or that consume collections. - self.force_beta_workflow_scheduled_min_steps = int( kwargs.get( 'force_beta_workflow_scheduled_min_steps', '250' ) ) + self.force_beta_workflow_scheduled_min_steps = int( kwargs.get( 'force_beta_workflow_scheduled_min_steps', '40' ) ) self.force_beta_workflow_scheduled_for_collections = string_as_bool( kwargs.get( 'force_beta_workflow_scheduled_for_collections', 'False' ) ) # Per-user Job concurrency limitations