Merge remote-tracking branch 'upstream/release_20.05' into dev

This commit is contained in:
mvdbeek
2020-09-22 16:16:19 +02:00
2 changed files with 15 additions and 1 deletions
+12
View File
@@ -42,6 +42,18 @@ To update an existing Galaxy repository run:
See the `community hub <https://galaxyproject.org/develop/source-code/>`__ for additional details regarding the source code locations.
Upgrade Warning for Admins
==========================
We have been simplifying the organization of our static and client content. As a result, the ``/static`` directory now
only requires a single rule in your proxy (nginx, Apache, etc.) configuration. Previously, additional rules for
``/static/scripts`` and ``/static/style`` were required. Both of these additional rules should be removed from your
proxy server configuration when upgrading your Galaxy server to release 20.05.
More information about proxy server configuration for Galaxy can be found in `Proxying Galaxy with NGINX
<https://docs.galaxyproject.org/en/release_20.05/admin/nginx.html>`__ and `Proxying Galaxy with Apache
<https://docs.galaxyproject.org/en/release_20.05/admin/apache.html>`__.
Release Notes
===========================================================
+3 -1
View File
@@ -388,8 +388,10 @@ class PulsarJobRunner(AsynchronousJobRunner):
job_id = pulsar_submit_job(client, client_job_description, remote_job_config)
log.info("Pulsar job submitted with job_id %s" % job_id)
job = job_wrapper.get_job()
# Set the job destination here (unlike other runners) because there are likely additional job destination
# params from the Pulsar client.
# Flush with change_state.
job_wrapper.set_external_id(job_id, job=job, flush=False)
job_wrapper.set_job_destination(job_destination, external_id=job_id, flush=False, job=job)
job_wrapper.change_state(model.Job.states.QUEUED, job=job)
except Exception:
job_wrapper.fail("failure running job", exception=True)