[ARVADOS] updated: da7eabf017b1f61c207d3beb861333eec7792db8

[git at public.curoverse.com]

Summary of changes:
 services/fuse/arvados_fuse/command.py  | 3 +--
 services/fuse/tests/mount_test_base.py | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

       via  da7eabf017b1f61c207d3beb861333eec7792db8 (commit)
      from  03ab37585a5f624f2c25a8a3ab8e1d864fc4d846 (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 da7eabf017b1f61c207d3beb861333eec7792db8
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Feb 2 16:46:35 2016 -0500

    8288: Do not call operations.destroy() as a last resort, just abandon the llfuse thread.

diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py
index ae0c920..6d53004 100644
--- a/services/fuse/arvados_fuse/command.py
+++ b/services/fuse/arvados_fuse/command.py
@@ -123,9 +123,8 @@ class Mount(object):
         if self.llfuse_thread.is_alive():
             self.logger.warning("Mount.__exit__:"
                                 " llfuse thread still alive %fs after umount"
-                                " -- resorting to operations.destroy()",
+                                " -- abandoning and exiting anyway",
                                 self.args.unmount_timeout)
-            self.operations.destroy()
 
     def run(self):
         if self.args.exec_args:
diff --git a/services/fuse/tests/mount_test_base.py b/services/fuse/tests/mount_test_base.py
index 91a4929..c79daf8 100644
--- a/services/fuse/tests/mount_test_base.py
+++ b/services/fuse/tests/mount_test_base.py
@@ -68,12 +68,11 @@ class MountTestBase(unittest.TestCase):
         del self.pool
 
         subprocess.call(["fusermount", "-u", "-z", self.mounttmp])
-        self.llfuse_thread.join(timeout=0.1)
+        self.llfuse_thread.join(timeout=1)
         if self.llfuse_thread.is_alive():
             logger.warning("MountTestBase.tearDown():"
-                           " llfuse thread still alive 100ms after umount"
-                           " -- resorting to operations.destroy()")
-            self.operations.destroy()
+                           " llfuse thread still alive 1s after umount"
+                           " -- abandoning and exiting anyway")
 
         os.rmdir(self.mounttmp)
         if self.keeptmp:

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


hooks/post-receive
--