Commit 9744022e authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge branch 'dev' of code.ornl.gov:ndip/galaxy into gzi-stderr-update

parents 485406af deee1a38

lib/galaxy/jobs/runners/pulsar.py

+4 −4
Original line number Diff line number Diff line
@@ -673,10 +673,10 @@ class PulsarJobRunner(AsynchronousJobRunner): 
            # Use Pulsar client code to transfer/copy files back

            # and cleanup job if needed.

            completed_normally = state not in [model.Job.states.ERROR, model.Job.states.DELETED]

            if completed_normally and state == model.Job.states.STOPPED:

                # Discard pulsar exit code (probably -9), we know the user stopped the job

                log.debug("Setting exit code for stopped job {job_wrapper.job_id} to 0 (was {exit_code})")

                exit_code = 0

#            if completed_normally and state == model.Job.states.STOPPED:

#                # Discard pulsar exit code (probably -9), we know the user stopped the job

#                log.debug("Setting exit code for stopped job {job_wrapper.job_id} to 0 (was {exit_code})")

#                exit_code = 0

            cleanup_job = job_wrapper.cleanup_job

            client_outputs = self.__client_outputs(client, job_wrapper)

            finish_args = dict(

lib/galaxy/metadata/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ def get_metadata_compute_strategy(config, job_id, metadata_strategy_override=Non 
    metadata_strategy = metadata_strategy_override or config.metadata_strategy

    if metadata_strategy == "legacy":

        raise Exception("legacy metadata_strategy has been removed")

    elif "extended" in metadata_strategy and tool_id != "__SET_METADATA__" and tool_type != "interactive":

    elif "extended" in metadata_strategy and tool_id != "__SET_METADATA__":

        return ExtendedDirectoryMetadataGenerator(job_id)

    else:

        return PortableDirectoryMetadataGenerator(job_id)