diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-09-16 17:23:02 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-09-16 17:24:07 -0700 |
| commit | 3f08c3e9331f9ab42e6f1f6ec73e85f3212de6c7 (patch) | |
| tree | ca6a6f2ba8addfc342f1f5c7dae059648b388de2 | |
| parent | c5e1c3f96f016c9ddfff8206d1bebeaf4ea44e6c (diff) | |
| download | tooz-3f08c3e9331f9ab42e6f1f6ec73e85f3212de6c7.tar.gz | |
Use a thread safe deque instead of a queue
Instead of using a queue like a deque just use
a deque directly instead, a queue doesn't seem
to add much value when its used like it was.
Change-Id: I515c14bb16e18c4031f446c7176915c94b3fb8f4
| -rw-r--r-- | tooz/drivers/zookeeper.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tooz/drivers/zookeeper.py b/tooz/drivers/zookeeper.py index 9b110e1..2bb304c 100644 --- a/tooz/drivers/zookeeper.py +++ b/tooz/drivers/zookeeper.py @@ -59,7 +59,7 @@ class BaseZooKeeperDriver(coordination.CoordinationDriver): raise coordination.ToozError("operation error: %s" % (e)) self._group_members = collections.defaultdict(set) - self._watchers = six.moves.queue.Queue() + self._watchers = collections.deque() self._leader_locks = {} def stop(self): @@ -228,7 +228,7 @@ class KazooDriver(BaseZooKeeperDriver): # Copy function in case it's removed later from the # hook list hooks = copy.copy(self._hooks_join_group[group_id]) - self._watchers.put( + self._watchers.append( lambda: hooks.run( coordination.MemberJoinedGroup( group_id, @@ -238,7 +238,7 @@ class KazooDriver(BaseZooKeeperDriver): # Copy function in case it's removed later from the # hook list hooks = copy.copy(self._hooks_leave_group[group_id]) - self._watchers.put( + self._watchers.append( lambda: hooks.run( coordination.MemberLeftGroup( group_id, @@ -336,11 +336,8 @@ class KazooDriver(BaseZooKeeperDriver): def run_watchers(self): ret = [] - while True: - try: - cb = self._watchers.get(block=False) - except six.moves.queue.Empty: - break + while self._watchers: + cb = self._watchers.popleft() ret.extend(cb()) for group_id in six.iterkeys(self._hooks_elected_leader): |