Update Test Galaxy and Pulsar, enable AMQP acknowledgements

galaxyproject · Sep 11, 2015 · 18417dd · 18417dd
1 parent 18e9a07
commit 18417dd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/stage/group_vars/all.yml b/stage/group_vars/all.yml
@@ -2,5 +2,5 @@
 
 deploy_env: stage
 
-galaxy_changeset_id: b79555264e6f1d7b042bd5650efeed1483252095
+galaxy_changeset_id: 91799c3891fe60f94fc52501541326904cc96071
 galaxy_vcs: git
diff --git a/stage/group_vars/pulsarservers.yml b/stage/group_vars/pulsarservers.yml
@@ -22,7 +22,7 @@ pip_virtualenv_command: "{{ instance_root }}/python/bin/virtualenv"
 ## used by: galaxyprojectdotorg.pulsar
 hg_executable: "{{ hg_virtualenv }}/bin/hg"
 pulsar_pip_install: true
-pulsar_changeset_id: 473edc0600de09e0210b0c9b425bbf9abbe48706
+pulsar_changeset_id: ac0b7c8b3d45cc4a6b8af369d89f9c3c61200772
 pulsar_venv_dir: "{{ pulsar_root }}/venv"
 # Need to update the server.ini template so this is unnecessary
 pulsar_server_dir: /does/not/matter

diff --git a/stage/host_vars/greenfield.psc.xsede.org.yml b/stage/host_vars/greenfield.psc.xsede.org.yml
@@ -11,6 +11,7 @@ pulsar_yaml_config:
   job_metrics_config_file: "{{ pulsar_config_dir }}/job_metrics_conf.xml"
   message_queue_url: "{{ pulsar_message_queue_url }}"
   dependency_resolvers_config_file: "{{ pulsar_config_dir }}/dependency_resolvers_conf.xml"
+  amqp_acknowledge: True
   amqp_publish_retry: True
   amqp_publish_retry_max_retries: 5
   amqp_publish_retry_interval_start: 10

diff --git a/stage/host_vars/login5.stampede.tacc.utexas.edu.yml b/stage/host_vars/login5.stampede.tacc.utexas.edu.yml
@@ -10,6 +10,7 @@ pulsar_yaml_config:
   tool_dependency_dir: "{{ instance_root }}/deps"
   job_metrics_config_file: "{{ pulsar_config_dir }}/job_metrics_conf.xml"
   message_queue_url: "{{ pulsar_message_queue_url }}"
+  amqp_acknowledge: True
   amqp_publish_retry: True
   amqp_publish_retry_max_retries: 5
   amqp_publish_retry_interval_start: 10

diff --git a/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2 b/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
@@ -18,6 +18,8 @@
             <param id="amqp_url">{{ galaxy_job_conf_amqp_url }}</param>
             <param id="galaxy_url">https://test.galaxyproject.org</param>
             <param id="manager">stampede</param>
+            <param id="persistence_directory">/srv/galaxy/test/var/pulsar_amqp_ack</param>
+            <param id="amqp_acknowledge">True</param>
             <param id="amqp_consumer_timeout">2.0</param>
             <param id="amqp_publish_retry">True</param>
             <param id="amqp_publish_retry_max_retries">600</param>
@@ -26,6 +28,8 @@
             <param id="amqp_url">{{ galaxy_job_conf_amqp_url }}</param>
             <param id="galaxy_url">https://test.galaxyproject.org</param>
             <param id="manager">stampede_nagios</param>
+            <param id="persistence_directory">/srv/galaxy/test/var/pulsar_amqp_ack</param>
+            <param id="amqp_acknowledge">True</param>
             <param id="amqp_consumer_timeout">2.0</param>
             <param id="amqp_publish_retry">True</param>
             <param id="amqp_publish_retry_max_retries">600</param>
@@ -34,6 +38,8 @@
             <param id="amqp_url">{{ galaxy_job_conf_amqp_url }}</param>
             <param id="galaxy_url">https://test.galaxyproject.org</param>
             <param id="manager">greenfield</param>
+            <param id="persistence_directory">/srv/galaxy/test/var/pulsar_amqp_ack</param>
+            <param id="amqp_acknowledge">True</param>
             <param id="amqp_consumer_timeout">2.0</param>
             <param id="amqp_publish_retry">True</param>
             <param id="amqp_publish_retry_max_retries">600</param>
@@ -42,6 +48,8 @@
             <param id="amqp_url">{{ galaxy_job_conf_amqp_url }}</param>
             <param id="galaxy_url">https://test.galaxyproject.org</param>
             <param id="manager">greenfield_nagios</param>
+            <param id="persistence_directory">/srv/galaxy/test/var/pulsar_amqp_ack</param>
+            <param id="amqp_acknowledge">True</param>
             <param id="amqp_consumer_timeout">2.0</param>
             <param id="amqp_publish_retry">True</param>
             <param id="amqp_publish_retry_max_retries">600</param>