[ARVADOS] updated: 97fe5c7710eb3a61757618df774447839b317ecb

[git at public.curoverse.com]

Summary of changes:
 services/fuse/arvados_fuse/fusedir.py | 7 +++++++
 1 file changed, 7 insertions(+)

       via  97fe5c7710eb3a61757618df774447839b317ecb (commit)
       via  d9b71fc2f2aa903a57a7ee083e5e92432f517bb7 (commit)
       via  e6be21fbf15765ba1ad380fa94de3d2b333407cf (commit)
      from  e13caf8cda321b07ce2bbe6e68d0e07c1d856a58 (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 97fe5c7710eb3a61757618df774447839b317ecb
Merge: e13caf8 d9b71fc
Author: radhika <radhika at curoverse.com>
Date:   Wed Jan 20 16:15:12 2016 -0500

    refs #6833
    Merge branch '6833-arv-mount-cache-refresh'


commit d9b71fc2f2aa903a57a7ee083e5e92432f517bb7
Author: radhika <radhika at curoverse.com>
Date:   Mon Jan 11 09:37:10 2016 -0500

    6833: get blobSignatureTtl from discovery document and use it to set the poll_time.

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 9c69200..00efab7 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -328,7 +328,11 @@ class CollectionDirectory(CollectionDirectoryBase):
         self.collection_record_file = None
         self.collection_record = None
         self.poll = True
-        self.poll_time = 60 * 60
+        try:
+            self.poll_time = (api._rootDesc.get('blobSignatureTtl', 60*60*2)/2)
+        except:
+            _logger.debug("Error getting blobSignatureTtl from discovery document: %s", sys.exc_info()[0])
+            self.poll_time = 60*60
 
         if isinstance(collection_record, dict):
             self.collection_locator = collection_record['uuid']

commit e6be21fbf15765ba1ad380fa94de3d2b333407cf
Author: radhika <radhika at curoverse.com>
Date:   Thu Jan 7 13:14:05 2016 -0500

    6833: add poll_time to CollectionDirectory.

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index a2135b3..9c69200 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -327,6 +327,9 @@ class CollectionDirectory(CollectionDirectoryBase):
         self.num_retries = num_retries
         self.collection_record_file = None
         self.collection_record = None
+        self.poll = True
+        self.poll_time = 60 * 60
+
         if isinstance(collection_record, dict):
             self.collection_locator = collection_record['uuid']
             self._mtime = convertTime(collection_record.get('modified_at'))

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


hooks/post-receive
--