Commit a9950573 authored by John Davis's avatar John Davis
Browse files

Merge branch 'release_24.0' into release_24.1

parents f3ff4344 4fd73fc0

lib/galaxy/jobs/runners/pulsar.py

+6 −1
Original line number Diff line number Diff line
@@ -322,7 +322,12 @@ class PulsarJobRunner(AsynchronousJobRunner): 


    def _update_job_state_for_status(self, job_state, pulsar_status, full_status=None):

        log.debug("(%s) Received status update: %s", job_state.job_id, pulsar_status)

        if pulsar_status in ["complete", "cancelled"] or job_state.job_wrapper.get_state() == model.Job.states.STOPPED:

        if pulsar_status in ["complete", "cancelled"]:

            self.mark_as_finished(job_state)

            return None

        if job_state.job_wrapper.get_state() == model.Job.states.STOPPED:

            client = self.get_client_from_state(job_state)

            client.kill()

            self.mark_as_finished(job_state)

            return None

        if pulsar_status in ["failed", "lost"]:

lib/galaxy/tools/__init__.py

+3 −1
Original line number Diff line number Diff line
@@ -3236,6 +3236,8 @@ class DatabaseOperationTool(Tool): 
                    )



        for input_dataset in input_datasets.values():

            if input_dataset:

                # None is a possible input for optional inputs

                check_dataset_state(input_dataset.state)



        for input_dataset_collection_pairs in input_dataset_collections.values():

lib/galaxy/tools/build_list_1.2.0.xml

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ This tool will create a new collection from your history datasets but your quota 
    </test>

    <test>

      <repeat name="datasets">

        <param name="input" value_json="null"/>

      </repeat>

      <output_collection name="output" type="list" count="0">

      </output_collection>