Configure a workflow scheduler on Test

galaxyproject · Oct 22, 2018 · ecce49a · ecce49a
1 parent 796070b
commit ecce49a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/env/common/templates/galaxy/config/workflow_schedulers_conf.xml.j2 b/env/common/templates/galaxy/config/workflow_schedulers_conf.xml.j2
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+    <workflow_schedulers default="core">
+    <core id="core" />
+    <handlers default="schedulers">
+    {%- for i in range(galaxy_workflow_scheduler_count) %}
+
+        <handler id="{{ galaxy_host_codename }}_workflow_scheduler0" tags="schedulers"/>
+    {%- endfor %}
+
+    </handlers>
+</workflow_schedulers>
diff --git a/env/common/templates/supervisor/galaxy_group.j2 b/env/common/templates/supervisor/galaxy_group.j2
@@ -8,6 +8,9 @@
 {%- if "galaxy_handler" in supervisord_configs %}
 {%- set programs = programs + ["galaxy_handler"] %}
 {%- endif %}
+{%- if "galaxy_workflow_scheduler" in supervisord_configs %}
+{%- set programs = programs + ["galaxy_workflow_scheduler"] %}
+{%- endif %}
 {%- if "galaxy_impersonate" in supervisord_configs %}
 {%- set programs = programs + ["galaxy_impersonate"] %}
 {%- endif %}

diff --git a/env/common/templates/supervisor/galaxy_workflow_scheduler.j2 b/env/common/templates/supervisor/galaxy_workflow_scheduler.j2
@@ -0,0 +1,19 @@
+;;
+;; This file is maintained by Ansible - CHANGES WILL BE OVERWRITTEN
+;;
+
+[program:galaxy_workflow_scheduler]
+command         = /usr/bin/sg {{ galaxy_system_group }} '{{ galaxy_venv_dir }}/bin/python ./scripts/galaxy-main -c {{ galaxy_config_dir }}/galaxy.ini --server-name={{ galaxy_host_codename }}_workflow_scheduler%(process_num)s'
+directory       = {{ galaxy_server_dir }}
+process_name    = workflow_scheduler%(process_num)s
+numprocs        = {{ galaxy_workflow_scheduler_count }}
+umask           = 022
+autostart       = true
+autorestart     = true
+startsecs       = 30
+user            = {{ galaxy_user }}
+environment     = HOME={{ ('~' ~ galaxy_user) | expanduser }},VIRTUAL_ENV={{ galaxy_venv_dir }},PATH={{ galaxy_venv_dir }}/bin:/cvmfs/{{ galaxy_instance_codename }}.galaxyproject.org/deps/_conda/envs/set_meta/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin,PYTHONPATH={{ galaxy_dynamic_rule_dir }}
+stdout_logfile  = {{ galaxy_log_dir }}/workflow_scheduler%(process_num)s.log
+stdout_logfile_maxbytes = 128MB
+stdout_logfile_backups = 64
+redirect_stderr = true
diff --git a/env/test/group_vars/galaxyservers/vars.yml b/env/test/group_vars/galaxyservers/vars.yml
@@ -47,9 +47,11 @@ galaxy_admin_email_to: galaxy-lab@bx.psu.edu
 
 ## used by: supervisor
 galaxy_handler_count: 4
+galaxy_workflow_scheduler_count: 1
 supervisord_group_configs:
   - galaxy
   - galaxy_handler
+  - galaxy_workflow_scheduler
   - galaxy_datamanager
   #- galaxy_reports
   - galaxy_group
@@ -204,6 +206,7 @@ base_app_main: &BASE_APP_MAIN
   #datatypes_config_file: "{{ galaxy_config_dir }}/datatypes_conf.xml"
   object_store_config_file: "{{ galaxy_config_dir }}/object_store_conf.xml"
   job_config_file: "{{ galaxy_config_dir }}/job_conf.xml"
+  workflow_schedulers_config_file: "{{ galaxy_config_dir }}/workflow_schedulers_conf.xml"
   job_resource_params_file: "{{ galaxy_config_dir }}/job_resource_params_conf.xml"
   data_manager_config_file: "{{ galaxy_config_dir }}/data_manager_conf.xml"
   job_metrics_config_file: "{{ galaxy_config_dir }}/job_metrics_conf.xml"
@@ -373,3 +376,5 @@ galaxy_config_templates:
     dest: "{{ galaxy_config_dir }}/reports.ini"
   - src: templates/galaxy/config/uwsgi.ini.j2
     dest: "{{ galaxy_config_dir }}/uwsgi.ini"
+  - src: templates/galaxy/config/workflow_schedulers_conf.xml.j2
+    dest: "{{ galaxy_config_dir }}/workflow_schedulers_conf.xml"
diff --git a/env/test/templates/galaxy/config/workflow_schedulers_conf.xml.j2 b/env/test/templates/galaxy/config/workflow_schedulers_conf.xml.j2
@@ -0,0 +1 @@
+../../../../common/templates/galaxy/config/workflow_schedulers_conf.xml.j2