From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp56.i.mail.ru (smtp56.i.mail.ru [217.69.128.36]) (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 2FB614696C3 for ; Sun, 12 Apr 2020 02:10:36 +0300 (MSK) From: Roman Khabibov Date: Sun, 12 Apr 2020 02:10:34 +0300 Message-Id: <20200411231034.95903-1-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] console: check on_shutdown() before exit List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Add check that on_shutdown() triggers were called before exit, because in case of EOF or Ctrl+D (no signals) they were ignored. Closes #4703 --- src/main.cc | 6 +++++ test/box/on_shutdown.result | 42 +++++++++++++++++++++++++++++++++++ test/box/on_shutdown.test.lua | 17 ++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/src/main.cc b/src/main.cc index bb0794dfe..a2cea3d40 100644 --- a/src/main.cc +++ b/src/main.cc @@ -902,6 +902,12 @@ main(int argc, char **argv) if (start_loop) say_crit("exiting the event loop"); + /* + * If Tarantool was stopped using Ctrl+D, then we need to + * call on_shutdown triggers, because Ctrl+D causes not + * any signals. + */ + tarantool_exit(exit_code); /* freeing resources */ tarantool_free(); return exit_code; diff --git a/test/box/on_shutdown.result b/test/box/on_shutdown.result index ccbdf45cb..38af72b11 100644 --- a/test/box/on_shutdown.result +++ b/test/box/on_shutdown.result @@ -167,3 +167,45 @@ test_run:cmd("delete server test") --- - true ... +-- +-- gh-4703: Make sure that on_shutdown triggers are executed after +-- EOF. +-- +fio = require("fio") +--- +... +file_name = "on_shutdown_triggered.txt" +--- +... +test_run:cmd("setopt delimiter ';'"); +--- +- true +... +on_shutdown_cmd = "box.ctl.on_shutdown(function() local fio = require('fio') ".. + "fio.open('"..file_name.."', {'O_CREAT', 'O_TRUNC', 'O_WRONLY'}, 777):clo".. + "se() end)"; +--- +... +test_run:cmd("setopt delimiter ''"); +--- +- true +... +server = io.popen('tarantool -i', 'w') +--- +... +server:write(on_shutdown_cmd) +--- +- true +... +server:close() +--- +- true +... +fio.path.lexists(file_name) == true +--- +- true +... +os.remove(file_name) +--- +- true +... diff --git a/test/box/on_shutdown.test.lua b/test/box/on_shutdown.test.lua index 2a9143404..795887202 100644 --- a/test/box/on_shutdown.test.lua +++ b/test/box/on_shutdown.test.lua @@ -65,3 +65,20 @@ test_run:grep_log('test', 'signal', nil, {noreset=true}) test_run:cmd("stop server test") test_run:cmd("cleanup server test") test_run:cmd("delete server test") + +-- +-- gh-4703: Make sure that on_shutdown triggers are executed after +-- EOF. +-- +fio = require("fio") +file_name = "on_shutdown_triggered.txt" +test_run:cmd("setopt delimiter ';'"); +on_shutdown_cmd = "box.ctl.on_shutdown(function() local fio = require('fio') ".. + "fio.open('"..file_name.."', {'O_CREAT', 'O_TRUNC', 'O_WRONLY'}, 777):clo".. + "se() end)"; +test_run:cmd("setopt delimiter ''"); +server = io.popen('tarantool -i', 'w') +server:write(on_shutdown_cmd) +server:close() +fio.path.lexists(file_name) == true +os.remove(file_name) -- 2.21.0 (Apple Git-122)