[ARVADOS] created: 861786a82aaab39df9dfcdcab654392e1ca4954e

[Git user]

        at  861786a82aaab39df9dfcdcab654392e1ca4954e (commit)


commit 861786a82aaab39df9dfcdcab654392e1ca4954e
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 19 16:15:17 2017 -0400

    10805: Fix crash during shutdown when running with llfuse 1.x.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 1bfd517..0829bb0 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -85,6 +85,8 @@ else:
     # llfuse >= 0.42
     llfuse._notify_queue = Queue.Queue()
 
+LLFUSE_VERSION_0 = llfuse.__version__.startswith('0')
+
 from fusedir import sanitize_filename, Directory, CollectionDirectory, TmpCollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase
 from fusefile import StringFile, FuseArvadosFile
 
@@ -371,12 +373,12 @@ class Operations(llfuse.Operations):
             self.events.close()
             self.events = None
 
-        if llfuse.lock.acquire():
+        if LLFUSE_VERSION_0 and llfuse.lock.acquire():
             # llfuse < 0.42
             self.inodes.clear()
             llfuse.lock.release()
         else:
-            # llfuse >= 0.42
+            # llfuse >= 0.42 (llfuse.lock is already held here)
             self.inodes.clear()
 
     def access(self, inode, mode, ctx):

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


hooks/post-receive
--