Merge branch '13108-acr-threading-fixes' refs #13108

[arvados.git] / sdk / cwl / arvados_cwl / crunch_script.py

diff --git a/sdk/cwl/arvados_cwl/crunch_script.py b/sdk/cwl/arvados_cwl/crunch_script.py
index fec728f5b785ef4897e05a334c920b93c12f7146..bf940eca4ba92fad7e01ccd06e70564cb2fa0103 100644 (file)
--- a/sdk/cwl/arvados_cwl/crunch_script.py
+++ b/sdk/cwl/arvados_cwl/crunch_script.py
@@ -97,7 +97,8 @@ def run():
             debug = job_order_object["arv:debug"]
             del job_order_object["arv:debug"]
 
-        runner = arvados_cwl.ArvCwlRunner(api_client=arvados.api('v1', model=OrderedJsonModel()),
+        runner = arvados_cwl.ArvCwlRunner(api_client=arvados.safeapi.ThreadSafeApiCache(
+            api_params={"model": OrderedJsonModel()}, keep_params={"num_retries": 4}),
                                           output_name=output_name, output_tags=output_tags)
 
         make_fs_access = functools.partial(CollectionFsAccess,
@@ -129,6 +130,8 @@ def run():
         args.trash_intermediate = False
         args.intermediate_output_ttl = 0
         args.priority = arvados_cwl.DEFAULT_PRIORITY
+        args.do_validate = True
+        args.disable_js_validation = False
 
         runner.arv_executor(t, job_order_object, **vars(args))
     except Exception as e: