From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvasiliev@tarantool.org>
Received: from smtp33.i.mail.ru (smtp33.i.mail.ru [94.100.177.93])
 (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 7BF5D4696C3
 for <tarantool-patches@dev.tarantool.org>;
 Fri, 24 Apr 2020 15:26:51 +0300 (MSK)
From: Leonid Vasiliev <lvasiliev@tarantool.org>
Date: Fri, 24 Apr 2020 15:26:47 +0300
Message-Id: <d6933382eeb3c931d60fd5462b7dca17cf2b3767.1587731005.git.lvasiliev@tarantool.org>
Subject: [Tarantool-patches] [PATCH] socket: fix error while closing
	socket.tcp_server
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, i.kosarev@tarantool.org
Cc: tarantool-patches@dev.tarantool.org

The tcp server starts in a separate fiber and when
the socket closes from another fiber the server's
fiber fails with an attempt to validate the server
socket. For check the socket status at server's
fiber a flag has been added and now server's fiber
will terminate correctly if the socket was closed.

Fixes: #4087
---
@Changelog fix error while closing socket.tcp_server socket(gh-4087)

 src/lua/socket.lua       |  9 +++++++++
 test/app/socket.result   | 14 ++++++++++++++
 test/app/socket.test.lua |  7 ++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/lua/socket.lua b/src/lua/socket.lua
index a334ad4..e453a53 100644
--- a/src/lua/socket.lua
+++ b/src/lua/socket.lua
@@ -102,6 +102,9 @@ local gc_socket_sentinel = ffi.new(gc_socket_t, { fd = -1 })
 
 local function socket_close(socket)
     local fd = check_socket(socket)
+    if socket._server_socket_closed ~= nil then
+        socket._server_socket_closed = true
+    end
     socket._errno = nil
     local r = ffi.C.coio_close(fd)
     -- .fd is const to prevent tampering
@@ -1082,6 +1085,9 @@ local function tcp_server_loop(server, s, addr)
     fiber.name(format("%s/%s:%s", server.name, addr.host, addr.port), {truncate = true})
     log.info("started")
     while socket_readable(s) do
+        if s._server_socket_closed then
+            break
+        end
         local sc, from = socket_accept(s)
         if sc == nil then
             local errno = s._errno
@@ -1216,6 +1222,9 @@ local function tcp_server(host, port, opts, timeout)
         return nil
     end
     fiber.create(tcp_server_loop, server, s, addr)
+    -- The _server_socket_closed flag is necessary for the server
+    -- to stop correctly when closing the socket.
+    s._server_socket_closed = false
     return s, addr
 end
 
diff --git a/test/app/socket.result b/test/app/socket.result
index 9f0ea0a..6206848 100644
--- a/test/app/socket.result
+++ b/test/app/socket.result
@@ -2914,3 +2914,17 @@ srv:close()
 ---
 - true
 ...
+--
+-- gh-4087: fix error while closing socket.tcp_server
+--
+srv = socket.tcp_server('127.0.0.1', 0, function() end)
+---
+...
+srv:close()
+---
+- true
+...
+test_run:wait_log('default', 'stopped', 1024, 0.01)
+---
+- stopped
+...
diff --git a/test/app/socket.test.lua b/test/app/socket.test.lua
index d1fe7ad..a399fca 100644
--- a/test/app/socket.test.lua
+++ b/test/app/socket.test.lua
@@ -987,4 +987,9 @@ s:settimeout(1)
 s:receive('*a')
 s:close()
 srv:close()
-
+--
+-- gh-4087: fix error while closing socket.tcp_server
+--
+srv = socket.tcp_server('127.0.0.1', 0, function() end)
+srv:close()
+test_run:wait_log('default', 'stopped', 1024, 0.01)
-- 
2.7.4