[ARVADOS] created: fe55632dfc42b65b42e3fa2a7852d358abac93e4
git at public.curoverse.com
git at public.curoverse.com
Sun Feb 7 21:25:12 EST 2016
at fe55632dfc42b65b42e3fa2a7852d358abac93e4 (commit)
commit fe55632dfc42b65b42e3fa2a7852d358abac93e4
Author: Tom Clegg <tom at curoverse.com>
Date: Sun Feb 7 21:24:56 2016 -0500
8388: Call terminate() instead of close() in hopes of avoiding stack traces
crying wolf during shutdown.
diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 6ac51f4..977e86c 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -349,7 +349,7 @@ class Operations(llfuse.Operations):
with llfuse.lock:
self._shutdown_started.set()
if self.events:
- self.events.close()
+ self.events.terminate()
self.events = None
self.inodes.clear()
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index fca1edf..ff6b422 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -32,7 +32,7 @@ setup(name='arvados_fuse',
('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
],
install_requires=[
- 'arvados-python-client >= 0.1.20151118035730',
+ 'arvados-python-client >= 0.1.20160206050907',
'llfuse==0.41.1',
'python-daemon',
'ciso8601'
commit 02dde15819e2e457c00c243b8d80be079175f786
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 5 20:00:26 2016 -0500
8388: Add PollClient.terminate method to match EventClient.terminate.
diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 94b8a9d..10ab622 100644
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -143,6 +143,16 @@ class PollClient(threading.Thread):
# to do so raises the same exception."
pass
+ def terminate(self):
+ """Stop polling.
+
+ Waits for any active :on_event: handlers to finish before
+ closing.
+
+ :on_event: will not be called after terminate() returns.
+ """
+ self.close(timeout=0)
+
def subscribe(self, filters):
self.on_event({'status': 200})
self.filters.append(filters)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list