projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2411-check-copyright'
[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 ab063867ac1c73bc6d04f20e148da45d9e21003f..64cd2aa04e562ded1d081ab71c56088cae54edb3 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvjob.py
+++ b/
sdk/cwl/arvados_cwl/arvjob.py
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
import logging
import re
import copy
import logging
import re
import copy
@@
-124,6
+128,12
@@
class ArvadosJob(object):
if not self.arvrunner.ignore_docker_for_reuse:
filters.append(["docker_image_locator", "in docker", runtime_constraints["docker_image"]])
if not self.arvrunner.ignore_docker_for_reuse:
filters.append(["docker_image_locator", "in docker", runtime_constraints["docker_image"]])
+ enable_reuse = kwargs.get("enable_reuse", True)
+ if enable_reuse:
+ reuse_req, _ = get_feature(self, "http://arvados.org/cwl#ReuseRequirement")
+ if reuse_req:
+ enable_reuse = reuse_req["enableReuse"]
+
try:
with Perf(metrics, "create %s" % self.name):
response = self.arvrunner.api.jobs().create(
try:
with Perf(metrics, "create %s" % self.name):
response = self.arvrunner.api.jobs().create(
@@
-137,7
+147,7
@@
class ArvadosJob(object):
"runtime_constraints": runtime_constraints
},
filters=filters,
"runtime_constraints": runtime_constraints
},
filters=filters,
- find_or_create=
kwargs.get("enable_reuse", True)
+ find_or_create=
enable_reuse
).execute(num_retries=self.arvrunner.num_retries)
self.arvrunner.processes[response["uuid"]] = self
).execute(num_retries=self.arvrunner.num_retries)
self.arvrunner.processes[response["uuid"]] = self