From 82c417d6e4de1b1846c9da3b8c0fd4b36a987d9c Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Fri, 9 Aug 2019 15:19:43 +0200 Subject: [PATCH 1/2] document workflow_schedulers_config_file --- doc/source/admin/galaxy_options.rst | 11 +++++++++++ lib/galaxy/config/sample/galaxy.yml.sample | 4 ++++ lib/galaxy/webapps/galaxy/config_schema.yml | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index 398ca602f96..ed02747d6b7 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -3505,6 +3505,17 @@ :Type: str +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``workflow_schedulers_config_file`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:Description: + Optional file containing workflow schedulers configuration, + similar to job handler configuration +:Default: ``config/workflow_schedulers_conf.xml`` +:Type: str + + ~~~~~~~~~~~~~~~~~~~~~~~~ ``cache_user_job_count`` ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index c0485138c37..90b3450d935 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -1701,6 +1701,10 @@ galaxy: # tags to do the mapping). #workflow_resource_params_mapper: config/workflow_resource_mapper_conf.yml + # Optional file containing workflow schedulers configuration, similar + # to job handler configuration + #workflow_schedulers_config_file: config/workflow_schedulers_conf.xml + # If using job concurrency limits (configured in job_config_file), # several extra database queries must be performed to determine the # number of jobs a user has dispatched to a given destination. By diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml index cee5956577e..3140514ba67 100644 --- a/lib/galaxy/webapps/galaxy/config_schema.yml +++ b/lib/galaxy/webapps/galaxy/config_schema.yml @@ -2612,6 +2612,14 @@ mapping: descriptions (additional types of mappings via these files could be implemented but haven't yet - for instance using workflow tags to do the mapping). + workflow_schedulers_config_file: + type: str + default: config/workflow_schedulers_conf.xml + required: false + desc: | + Optional file containing workflow schedulers configuration, similar + to job handler configuration + cache_user_job_count: type: bool default: false From af5ecc487de648998e6ae3a0914ff47c8c534b48 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Fri, 9 Aug 2019 16:14:32 +0200 Subject: [PATCH 2/2] rewrite --- doc/source/admin/galaxy_options.rst | 4 ++-- lib/galaxy/config/sample/galaxy.yml.sample | 4 ++-- lib/galaxy/webapps/galaxy/config_schema.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index ed02747d6b7..5e65ae3cb22 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -3510,8 +3510,8 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ :Description: - Optional file containing workflow schedulers configuration, - similar to job handler configuration + Optional configuration file similar to `job_config_file` to + specify which Galaxy processes should schedule workflows. :Default: ``config/workflow_schedulers_conf.xml`` :Type: str diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index 90b3450d935..ff4d675020c 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -1701,8 +1701,8 @@ galaxy: # tags to do the mapping). #workflow_resource_params_mapper: config/workflow_resource_mapper_conf.yml - # Optional file containing workflow schedulers configuration, similar - # to job handler configuration + # Optional configuration file similar to `job_config_file` to specify + # which Galaxy processes should schedule workflows. #workflow_schedulers_config_file: config/workflow_schedulers_conf.xml # If using job concurrency limits (configured in job_config_file), diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml index 3140514ba67..ec84757e160 100644 --- a/lib/galaxy/webapps/galaxy/config_schema.yml +++ b/lib/galaxy/webapps/galaxy/config_schema.yml @@ -2617,8 +2617,8 @@ mapping: default: config/workflow_schedulers_conf.xml required: false desc: | - Optional file containing workflow schedulers configuration, similar - to job handler configuration + Optional configuration file similar to `job_config_file` to specify + which Galaxy processes should schedule workflows. cache_user_job_count: type: bool