From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 75D69287DD for ; Tue, 28 Aug 2018 07:09:35 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2Gqcw4qklXdH for ; Tue, 28 Aug 2018 07:09:35 -0400 (EDT) Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id C910828287 for ; Tue, 28 Aug 2018 07:09:34 -0400 (EDT) From: Georgy Kirichenko Subject: [tarantool-patches] [PATCH v4] Don't throw an exception in a replication handler Date: Tue, 28 Aug 2018 14:09:29 +0300 Message-Id: <1b51a741a9827aefcd8e136ba58be75de3053895.1535454444.git.georgy@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Georgy Kirichenko It is an error to throw an error out of a cbus message handler because it breaks cbus message delivery. In case of replication throwing an error prevents iproto against replication socket closing. Fixes 3642 --- Changes in v4: - Proper RLIMIT_NOFILE for MacOS Changes in v3: - Move rlimit ffi bindings to separate file Changes in v2: - Test fixes (setrlimit, formating) - Test result file included https://github.com/tarantool/tarantool/issues/3642 https://github.com/tarantool/tarantool/tree/g.kirichenko/gh-3642-fix-replication-socket-leak src/box/iproto.cc | 2 +- test/replication/lua/rlimit.lua | 24 +++++++++++ test/replication/misc.result | 76 +++++++++++++++++++++++++++++++++ test/replication/misc.test.lua | 33 ++++++++++++++ test/replication/suite.ini | 2 +- 5 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 test/replication/lua/rlimit.lua diff --git a/src/box/iproto.cc b/src/box/iproto.cc index ab7b42169..984c6df44 100644 --- a/src/box/iproto.cc +++ b/src/box/iproto.cc @@ -1424,7 +1424,7 @@ tx_process_join_subscribe(struct cmsg *m) unreachable(); } } catch (SocketError *e) { - throw; /* don't write error response to prevent SIGPIPE */ + return; /* don't write error response to prevent SIGPIPE */ } catch (Exception *e) { iproto_write_error(con->input.fd, e, ::schema_version, msg->header.sync); diff --git a/test/replication/lua/rlimit.lua b/test/replication/lua/rlimit.lua new file mode 100644 index 000000000..9963925fc --- /dev/null +++ b/test/replication/lua/rlimit.lua @@ -0,0 +1,24 @@ + +ffi = require('ffi') +ffi.cdef([[ +typedef long rlim_t; +struct rlimit { + rlim_t rlim_cur; /* Soft limit */ + rlim_t rlim_max; /* Hard limit (ceiling for rlim_cur) */ +}; +int getrlimit(int resource, struct rlimit *rlim); +int setrlimit(int resource, const struct rlimit *rlim); +]]) + +return { + RLIMIT_NOFILE = jit.os == 'OSX' and 8 or 7, + limit = function() + return ffi.new('struct rlimit') + end, + getrlimit = function (id, limit) + ffi.C.getrlimit(id, limit) + end, + setrlimit = function (id, limit) + ffi.C.setrlimit(id, limit) + end, +} diff --git a/test/replication/misc.result b/test/replication/misc.result index 76e7fd5ee..a407abab5 100644 --- a/test/replication/misc.result +++ b/test/replication/misc.result @@ -229,6 +229,82 @@ test_run:cmd("switch default") test_run:drop_cluster(SERVERS) --- ... +rlimit = require('rlimit') +--- +... +lim = rlimit.limit() +--- +... +rlimit.getrlimit(rlimit.RLIMIT_NOFILE, lim) +--- +... +old_fno = lim.rlim_cur +--- +... +lim.rlim_cur = 64 +--- +... +rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) +--- +... +test_run:cmd('create server sock with rpl_master=default, script="replication/replica.lua"') +--- +- true +... +test_run:cmd(string.format('start server sock')) +--- +- true +... +test_run:cmd('switch sock') +--- +- true +... +test_run = require('test_run').new() +--- +... +fiber = require('fiber') +--- +... +test_run:cmd("setopt delimiter ';'") +--- +- true +... +for i = 1, 64 do + local replication = box.cfg.replication + box.cfg{replication = {}} + box.cfg{replication = replication} + while box.info.replication[1].upstream.status ~= 'follow' do + fiber.sleep(0.0001) + end +end; +--- +... +test_run:cmd("setopt delimiter ''"); +--- +- true +... +box.info.replication[1].upstream.status +--- +- follow +... +test_run:cmd('switch default') +--- +- true +... +lim.rlim_cur = old_fno +--- +... +rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) +--- +... +test_run:cmd('stop server sock') +--- +- true +... +test_run:cmd('cleanup server sock') +--- +- true +... box.schema.user.revoke('guest', 'replication') --- ... diff --git a/test/replication/misc.test.lua b/test/replication/misc.test.lua index c60adf5a5..b23607eb8 100644 --- a/test/replication/misc.test.lua +++ b/test/replication/misc.test.lua @@ -90,6 +90,39 @@ box.space.space1:drop() test_run:cmd("switch default") test_run:drop_cluster(SERVERS) +rlimit = require('rlimit') +lim = rlimit.limit() +rlimit.getrlimit(rlimit.RLIMIT_NOFILE, lim) +old_fno = lim.rlim_cur +lim.rlim_cur = 64 +rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) + +test_run:cmd('create server sock with rpl_master=default, script="replication/replica.lua"') +test_run:cmd(string.format('start server sock')) +test_run:cmd('switch sock') +test_run = require('test_run').new() +fiber = require('fiber') +test_run:cmd("setopt delimiter ';'") +for i = 1, 64 do + local replication = box.cfg.replication + box.cfg{replication = {}} + box.cfg{replication = replication} + while box.info.replication[1].upstream.status ~= 'follow' do + fiber.sleep(0.0001) + end +end; +test_run:cmd("setopt delimiter ''"); + +box.info.replication[1].upstream.status + +test_run:cmd('switch default') + +lim.rlim_cur = old_fno +rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) + +test_run:cmd('stop server sock') +test_run:cmd('cleanup server sock') + box.schema.user.revoke('guest', 'replication') -- diff --git a/test/replication/suite.ini b/test/replication/suite.ini index b489add58..8b4db9c72 100644 --- a/test/replication/suite.ini +++ b/test/replication/suite.ini @@ -5,6 +5,6 @@ description = tarantool/box, replication disabled = consistent.test.lua release_disabled = catch.test.lua errinj.test.lua gc.test.lua before_replace.test.lua quorum.test.lua recover_missing_xlog.test.lua config = suite.cfg -lua_libs = lua/fast_replica.lua +lua_libs = lua/fast_replica.lua lua/rlimit.lua long_run = prune.test.lua is_parallel = False -- 2.18.0