x/deb-oslo.messaging
Code Issues Proposed changes

Ensure callback variable capture + cleanup is done correctly

Browse Source 
It appears the the callback variable that was being called on
future done was not the right one, due to the lambda capture
mechanism referring to a lazy variable which would potentially
be a different callback by the time the future would finish so
make sure we capture the right one and ensure the future has access
to it.

This adds a helper method that submission will go through
to ensure that the callback variable is correctly captured
in the created lambda and also ensures that the incomplete futures
list is cleaned up (when the future is done).

The notification listener tests use now eventlet to show up this
issue that doesn't occur with blocking executor.

Closes-bug: #1474943

Closes-bug: #1475307

Change-Id: I23e393d504662532572b5b344b87387be6d7bcb1
This commit is contained in:
Joshua Harlow
2015-07-15 10:26:06 -07:00
parent 8a9b5d44ae
commit 02a3a39814
2 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
oslo_messaging/tests/notify/test_listener.py
View File

@@ -31,17 +31,30 @@ class RestartableServerThread(object):
def __init__(self, server):
self.server = server
self.thread = None
self._started = threading.Event()
self._tombstone = threading.Event()
def start(self):
self._tombstone.clear()
if self.thread is None:
self.thread = threading.Thread(target=self.server.start)
self._started.clear()
self.thread = threading.Thread(target=self._target)
self.thread.daemon = True
self.thread.start()
self._started.wait()
def _target(self):
self.server.start()
self._started.set()
self._tombstone.wait()
def stop(self):
if self.thread is not None:
# Check start() does nothing with a running listener
self.server.start()
self._tombstone.set()
if self.thread is not None:
self.server.stop()
self.server.wait()
self.thread.join(timeout=15)
@@ -101,7 +114,7 @@ class ListenerSetupMixin(object):
tracker_name, self.ThreadTracker())
listener = oslo_messaging.get_notification_listener(
transport, targets=targets, endpoints=[tracker] + endpoints,
allow_requeue=True, pool=pool)
allow_requeue=True, pool=pool, executor='eventlet')
thread = RestartableServerThread(listener)
tracker.start(thread)