From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 7 Jul 2017 15:27:07 +0000 (-0400)
Subject: Merge branch '10584-fuse-stop-threads' refs #10584
X-Git-Tag: 1.1.0~150
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1e31815d4a0d094633d4acb4f6265d6b8b6e3246?hp=e2b3986edaa262ad49c3ef74a75518611776c2cf

Merge branch '10584-fuse-stop-threads' refs #10584

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curoverse.com>
---

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 1399822303..30ae6b40e0 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -511,6 +511,8 @@ class CollectionDirectory(CollectionDirectoryBase):
             self.collection.stop_threads()
 
     def clear(self):
+        if self.collection is not None:
+            self.collection.stop_threads()
         super(CollectionDirectory, self).clear()
         self._manifest_size = 0