[ARVADOS] updated: 3a88a5d8753593be89373c5b124fc5a8398457a0

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/crunch_script.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

       via  3a88a5d8753593be89373c5b124fc5a8398457a0 (commit)
      from  5152e0bf159151eaf04d31b788d57bebf7ab089b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3a88a5d8753593be89373c5b124fc5a8398457a0
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Apr 13 17:32:44 2017 -0400

    11462: Fix crunch script for fetcher_constructor constructor change.

diff --git a/sdk/cwl/arvados_cwl/crunch_script.py b/sdk/cwl/arvados_cwl/crunch_script.py
index 8073620..9ea4824 100644
--- a/sdk/cwl/arvados_cwl/crunch_script.py
+++ b/sdk/cwl/arvados_cwl/crunch_script.py
@@ -23,7 +23,7 @@ from cwltool.process import shortname, adjustFileObjs, adjustDirObjs, normalizeF
 from cwltool.load_tool import load_tool
 from cwltool.errors import WorkflowException
 
-from .fsaccess import CollectionFetcher
+from .fsaccess import CollectionFetcher, CollectionFsAccess
 
 logger = logging.getLogger('arvados.cwl-runner')
 
@@ -88,10 +88,14 @@ def run():
         runner = arvados_cwl.ArvCwlRunner(api_client=arvados.api('v1', model=OrderedJsonModel()),
                                           output_name=output_name, output_tags=output_tags)
 
+        make_fs_access = functools.partial(CollectionFsAccess,
+                                 collection_cache=runner.collection_cache)
+
         t = load_tool(toolpath, runner.arv_make_tool,
                       fetcher_constructor=functools.partial(CollectionFetcher,
-                                                            api_client=api,
-                                                            keep_client=arvados.keep.KeepClient(api_client=api, num_retries=4)))
+                                                  api_client=runner.api,
+                                                  fs_access=make_fs_access(""),
+                                                  num_retries=runner.num_retries))
 
         args = argparse.Namespace()
         args.project_uuid = arvados.current_job()["owner_uuid"]
@@ -104,6 +108,8 @@ def run():
         args.basedir = os.getcwd()
         args.name = None
         args.cwl_runner_job={"uuid": arvados.current_job()["uuid"], "state": arvados.current_job()["state"]}
+        args.make_fs_access = make_fs_access
+
         runner.arv_executor(t, job_order_object, **vars(args))
     except Exception as e:
         if isinstance(e, WorkflowException):

-----------------------------------------------------------------------


hooks/post-receive
--