[ARVADOS] updated: 1.1.3-93-g68cde7e

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/fsaccess.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  68cde7e2a496c4e57cb1576bb8bf29415d3c0b67 (commit)
       via  b3f083ce49a50521d96daa28f896d857384222fb (commit)
      from  a4959ce78b69f1f4e0e59e2458af8d11bc1d5510 (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 68cde7e2a496c4e57cb1576bb8bf29415d3c0b67
Merge: a4959ce b3f083c
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Feb 23 13:28:50 2018 -0500

    Merge branch 'wtsi/13113-acr-collectioncache-retries' refs #13113
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit b3f083ce49a50521d96daa28f896d857384222fb
Author: Joshua Randall <joshua.randall at sanger.ac.uk>
Date:   Wed Feb 21 20:51:56 2018 +0000

    Fix CollectionCache to pass num_retries to CollectionReader
    
    Arvados-DCO-1.1-Signed-off-by: Joshua C. Randall <jcrandall at alum.mit.edu>

diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index 69f918e..0b577b0 100644
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -32,6 +32,7 @@ class CollectionCache(object):
                  min_entries=2):
         self.api_client = api_client
         self.keep_client = keep_client
+        self.num_retries = num_retries
         self.collections = OrderedDict()
         self.lock = threading.Lock()
         self.total = 0
@@ -54,7 +55,8 @@ class CollectionCache(object):
             if pdh not in self.collections:
                 logger.debug("Creating collection reader for %s", pdh)
                 cr = arvados.collection.CollectionReader(pdh, api_client=self.api_client,
-                                                         keep_client=self.keep_client)
+                                                         keep_client=self.keep_client,
+                                                         num_retries=self.num_retries)
                 sz = len(cr.manifest_text()) * 128
                 self.collections[pdh] = (cr, sz)
                 self.total += sz

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


hooks/post-receive
--