From 2124d9caaa4c59138563e543e60c02a876c0efb6 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 21 Sep 2020 12:41:42 -0400 Subject: [PATCH 1/2] Restore the use of set_job_destination() in the Pulsar runner's queue_job() method because it is necessary to persist destination params provided by the client. --- lib/galaxy/jobs/runners/pulsar.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/runners/pulsar.py b/lib/galaxy/jobs/runners/pulsar.py index eec3a14a3fd..e6489ad0673 100644 --- a/lib/galaxy/jobs/runners/pulsar.py +++ b/lib/galaxy/jobs/runners/pulsar.py @@ -390,8 +390,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) From ec106604d289e3cf8effbe0a7dce1ae5c8b5ef5c Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 21 Sep 2020 16:15:12 -0400 Subject: [PATCH 2/2] Include an upgrade warning for 20.05 regarding the drop of the blue symlink in static --- doc/source/releases/20.05_announce.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/source/releases/20.05_announce.rst b/doc/source/releases/20.05_announce.rst index 48b6a5857f0..ee0d97edbc1 100644 --- a/doc/source/releases/20.05_announce.rst +++ b/doc/source/releases/20.05_announce.rst @@ -42,6 +42,18 @@ To update an existing Galaxy repository run: See the `community hub `__ 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 +`__ and `Proxying Galaxy with Apache +`__. + Release Notes ===========================================================