From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvasiliev@tarantool.org>
Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
 bits)) (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 4B17046970E
 for <tarantool-patches@dev.tarantool.org>;
 Mon, 16 Dec 2019 12:01:03 +0300 (MSK)
References: <0a45779911c6218147511037fc022aad8af69709.1576485088.git.lvasiliev@tarantool.org>
From: Leonid Vasiliev <lvasiliev@tarantool.org>
Message-ID: <e1625d2e-578d-f618-e299-3c2e8aabfbdd@tarantool.org>
Date: Mon, 16 Dec 2019 12:01:01 +0300
MIME-Version: 1.0
In-Reply-To: <0a45779911c6218147511037fc022aad8af69709.1576485088.git.lvasiliev@tarantool.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH] Fix take a task after disconnect
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: alexander.turenko@tarantool.org
Cc: tarantool-patches@dev.tarantool.org

Update:
---
--- a/queue/abstract.lua
+++ b/queue/abstract.lua
@@ -96,6 +96,8 @@ function tube.take(self, timeout)

          if session.exists(sid) then
              task = self.raw:take()
+        else
+            return nil
          end

          if task ~= nil then

On 12/16/19 11:33 AM, Leonid Vasiliev wrote:
> https://github.com/tarantool/queue/issues/104
> https://github.com/tarantool/queue/tree/lvasiliev/gh-queue-104-take-task-after-disconnect
> 
> ---
>   queue/abstract.lua | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/queue/abstract.lua b/queue/abstract.lua
> index ad8817d..e5cfa39 100644
> --- a/queue/abstract.lua
> +++ b/queue/abstract.lua
> @@ -94,7 +94,9 @@ function tube.take(self, timeout)
>           conds[fid]:free()
>           box.space._queue_consumers:delete{ sid, fid }
>   
> -        task = self.raw:take()
> +        if session.exists(sid) then
> +            task = self.raw:take()
> +        end
>   
>           if task ~= nil then
>               return self.raw:normalize_task(task)
>