Use fiber.cancel

Author: LeonidVas

queue/abstract.lua

@@ -73,7 +73,6 @@ function tube.put(self, data, opts)
 end
 
 local conds = {}
-local releasing_sessions = {}
 
 function tube.take(self, timeout)
     timeout = time(timeout or TIMEOUT_INFINITY)
@@ -95,13 +94,7 @@ function tube.take(self, timeout)
         conds[fid]:free()
         box.space._queue_consumers:delete{ sid, fid }
 
-        -- We don't take a task if the session is in a disconnecting state
-        if releasing_sessions[fid] == nil then
-            task = self.raw:take()
-        else
-            releasing_sessions[fid] = nil
-            return nil
-        end
+        task = self.raw:take()
 
         if task ~= nil then
             return self.raw:normalize_task(task)
@@ -363,8 +356,9 @@ function method._on_consumer_disconnect()
         box.space._queue_consumers:delete{ waiter[1], waiter[2] }
         local cond = conds[waiter[2]]
         if cond then
-            releasing_sessions[waiter[2]] = true
-            cond:signal(waiter[2])
+            fiber_w = fiber.find(waiter[2])
+            fiber_w:cancel()
+            conds[waiter[2]] = nil
         end
     end