projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10793-cwl-continue-on-error' closes #10793
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvjob.py
diff --git
a/sdk/cwl/arvados_cwl/arvjob.py
b/sdk/cwl/arvados_cwl/arvjob.py
index 780d6bd5ac86ac3c51e4089e8a741cdc8a9efc2b..11ef653a3d76c5862148493dc1736c0d72fadd0d 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvjob.py
+++ b/
sdk/cwl/arvados_cwl/arvjob.py
@@
-223,9
+223,8
@@
class ArvadosJob(object):
logger.error("Unexpected output type %s '%s'", type(outputs), outputs)
outputs = {}
processStatus = "permanentFail"
logger.error("Unexpected output type %s '%s'", type(outputs), outputs)
outputs = {}
processStatus = "permanentFail"
-
- self.output_callback(outputs, processStatus)
finally:
finally:
+ self.output_callback(outputs, processStatus)
if record["uuid"] in self.arvrunner.processes:
del self.arvrunner.processes[record["uuid"]]
if record["uuid"] in self.arvrunner.processes:
del self.arvrunner.processes[record["uuid"]]
@@
-252,6
+251,9
@@
class RunnerJob(Runner):
self.job_order["arv:enable_reuse"] = self.enable_reuse
self.job_order["arv:enable_reuse"] = self.enable_reuse
+ if self.on_error:
+ self.job_order["arv:on_error"] = self.on_error
+
return {
"script": "cwl-runner",
"script_version": "master",
return {
"script": "cwl-runner",
"script_version": "master",