Fixes race condition in Redis transport. Closes celery/celery#940. Closes celery/celery#938. Closes celery/celery#935

1 files changed, 3 insertions, 2 deletions

diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index 39c8b4ca..5b826bfe 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -111,7 +111,7 @@ class QoS(virtual.QoS):
             M, EX, RK = loads(p)
             self.channel._do_restore_message(M, EX, RK)
 
-    @cached_property
+    @property
     def client(self):
         return self.channel._avail_client
 
@@ -206,7 +206,8 @@ class MultiChannelPoller(object):
     def on_poll_empty(self):
         for channel in self._channels:
             if channel.active_queues:
-                channel.qos.restore_visible()
+                # only need to do this once, as they are not local to channel.
+                return channel.qos.restore_visible()
 
     def handle_event(self, fileno, event):
         if event & READ: