From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 6FAD270310; Wed, 27 Jan 2021 02:38:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6FAD270310 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611704323; bh=byh8lLaIBuL38iIWH2Cn54B+itkVIiIVz7i8cxDZck0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kWtxCsIuEDL9gJTLNysq1eR3VEXaPMq7RDZO6w9Mh7Tg3WmvbgdCiZOlYVdMcd8/w JlxSbQIc2xrt4YIx0BbQ+PUnQ34Dz+2SeKZr8UfCi9H1wdOjQjFX9Id9y3xp+xhpjX xgzJ7TKf/tUoNuUxXzYQ5ne1cXJ3OgdwN2Yo1wR0= Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) (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 BDE1384380 for ; Wed, 27 Jan 2021 02:37:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BDE1384380 Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1l4Xta-0002oP-ME; Wed, 27 Jan 2021 02:37:15 +0300 To: Alexander Turenko Date: Wed, 27 Jan 2021 02:37:08 +0300 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92BC6D7A73B5E1EC98D61BD93E2B73C0173045E87F590163300894C459B0CD1B9FFAE89D3F90AC977025B2EAFBB8B283979EEC448202F9853C9EA2F84C7A79467 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE737BB76880A4CA9A4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378D7045943A292EC88638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC1223A9679A0740CB14B97F1607F60DFD61339EE2DCB8EEFC389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A3E989B1926288338941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6D082881546D93491CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249F62E2DC5BE1D6F2C76E601842F6C81A12EF20D2F80756B5F7E9C4E3C761E06A776E601842F6C81A127C277FBC8AE2E8B9221B9F450D853153AA81AA40904B5D9DBF02ECDB25306B2B25CBF701D1BE8734AD6D5ED66289B5278DA827A17800CE760822658196F8C5A67F23339F89546C5A8DF7F3B2552694A6FED454B719173D6725E5C173C3A84C3705BB8FF2EA96B1B35872C767BF85DA2F004C906525384306FED454B719173D6462275124DF8B9C9DE2850DD75B2526BE5BFE6E7EFDEDCD789D4C264860C145E X-B7AD71C0: 14C14B24D00AF5AC321EF223B8115265C69B993890792DF82CDD5689AFBDA7A24A6D60772A99906F8E1CD14B953EB46DD206023FC80DD386355D89D7DBCDD132 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CEC4A33FB89DC571C5996FCA853CEE1DE0EA47310CCEA56D69C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFF532FBFD8162E58C699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34E420FF71F2F0FE03591C025C3FC542047524EE8A04321F0DA0D33060D68A7E0231950EB088E846A91D7E09C32AA3244C59C6C7A2EFBE2DD16E5021FAF69C394CF522A1CF68F4BE0583B48618A63566E0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj5ZUBkD5pAd+iKtxit0S17w== X-Mailru-Sender: 65CD03CFE33A0EC7A4D6F6B2DF798FE60C211C0914160BD78FF876F6D6CB2060CF22F1D7FF2AE877B08A37556DE0CB7BB7E364AFDB3F206FD953F29DB7D76D89B1E6F68DAE724AB9112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH 3/3] lua: fix tarantool -e always enters interactive mode X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Artem Starshov via Tarantool-patches Reply-To: Artem Starshov Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" The reason why tarantool -e always enters interactive mode is that statement after option -e isn't considered as a script. In man PUC-Rio lua there are different names for statement -e (stat) and script, but they have the same behavior regarding interactive mode. (Also cases, when interpreter loads stdin, have the same behaviour). Fixes #5040 --- src/lib/core/errinj.h | 1 + src/lua/init.c | 28 +++- ...40-always-enters-interactive-mode.test.lua | 121 ++++++++++++++++++ test/box/errinj.result | 1 + 4 files changed, 147 insertions(+), 4 deletions(-) create mode 100755 test/app-tap/gh-5040-always-enters-interactive-mode.test.lua diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index dc0657614..89d2d3314 100644 --- a/src/lib/core/errinj.h +++ b/src/lib/core/errinj.h @@ -149,6 +149,7 @@ struct errinj { _(ERRINJ_AUTO_UPGRADE, ERRINJ_BOOL, {.bparam = false})\ _(ERRINJ_COIO_WRITE_CHUNK, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_APPLIER_SLOW_ACK, ERRINJ_BOOL, {.bparam = false}) \ + _(ERRINJ_STDIN_ISATTY, ERRINJ_INT, {.iparam = -1}) \ ENUM0(errinj_id, ERRINJ_LIST); extern struct errinj errinjs[]; diff --git a/src/lua/init.c b/src/lua/init.c index 25e8884a6..c27b2c7da 100644 --- a/src/lua/init.c +++ b/src/lua/init.c @@ -61,6 +61,7 @@ #include "lua/utf8.h" #include "lua/swim.h" #include "lua/decimal.h" +#include "errinj.h" #include "digest.h" #include @@ -583,6 +584,7 @@ run_script_f(va_list ap) */ struct diag *diag = va_arg(ap, struct diag *); bool aux_loop_is_run = false; + bool option_e_runned = false; /* * Load libraries and execute chunks passed by -l and -e @@ -613,6 +615,7 @@ run_script_f(va_list ap) if (luaT_call(L, 0, 0) != 0) goto error; lua_settop(L, 0); + option_e_runned = true; break; default: unreachable(); /* checked by getopt() in main() */ @@ -627,25 +630,42 @@ run_script_f(va_list ap) fiber_sleep(0.0); aux_loop_is_run = true; + /* + * Detect is stdin a tty if it's set in error injection, + * otherwise use standard isatty. + * Specially use direct referring to errinjs cause in + * non debug mode it's not available, but needed for tests. + */ + int is_atty; + assert(ERRINJ_STDIN_ISATTY >= 0 && ERRINJ_STDIN_ISATTY < errinj_id_MAX); + assert(errinjs[ERRINJ_STDIN_ISATTY].type == ERRINJ_INT); + struct errinj *inj = &errinjs[ERRINJ_STDIN_ISATTY]; + if (inj != NULL && inj->iparam >= 0) { + is_atty = inj->iparam; + } else { + is_atty = isatty(STDIN_FILENO); + } + if (path && strcmp(path, "-") != 0 && access(path, F_OK) == 0) { /* Execute script. */ if (luaL_loadfile(L, path) != 0) goto luajit_error; if (lua_main(L, argc, argv) != 0) goto error; - } else if (!isatty(STDIN_FILENO) || (path && strcmp(path, "-") == 0)) { + } else if (!is_atty || (path && strcmp(path, "-") == 0)) { /* Execute stdin */ if (luaL_loadfile(L, NULL) != 0) goto luajit_error; if (lua_main(L, argc, argv) != 0) goto error; - } else { + } else if (!option_e_runned) { interactive = true; } /* - * Start interactive mode when it was explicitly requested - * by "-i" option or stdin is TTY or there are no script. + * Start interactive mode in any of the cases: + * - it was explicitly requested by "-i" option; + * - stdin is TTY and there are no script (-e is considered as a script). */ if (interactive) { say_crit("%s %s\ntype 'help' for interactive help", diff --git a/test/app-tap/gh-5040-always-enters-interactive-mode.test.lua b/test/app-tap/gh-5040-always-enters-interactive-mode.test.lua new file mode 100755 index 000000000..de7e990be --- /dev/null +++ b/test/app-tap/gh-5040-always-enters-interactive-mode.test.lua @@ -0,0 +1,121 @@ +#!/usr/bin/env tarantool + +local process_timeout = require('process_timeout') +local ffi = require('ffi') +local tap = require('tap') +local fio = require('fio') + +-- +-- Tests to check if the tarantool binary enters +-- interactive mode or not. +-- + +local TARANTOOL_PATH = arg[-1] +local output_file = fio.abspath('out.txt') +local cmd_end = (' >%s & echo $!'):format(output_file) + +-- Like a default timeout for `cond_wait` in test-run +local process_waiting_timeout = 60.0 +local file_read_timeout = 60.0 +local file_read_interval = 0.2 +local file_open_timeout = 60.0 + +-- Each command consists of: +-- * cmd_args - command line arguments for tarantool binary +-- * stdin - stdin for tarantool +-- * interactive - true if interactive mode expected +-- * empty_output - true if command should have empty output +local commands = { + { + cmd_args = '', + stdin = 'tty', + interactive = true + }, + { + cmd_args = '', + stdin = '/dev/null', + interactive = false, + empty_output = true + }, + + { + cmd_args = ' -e "print(_VERSION)"', + stdin = 'tty', + interactive = false + }, + { + cmd_args = ' -e "print(_VERSION)"', + stdin = '/dev/null', + interactive = false + }, + + { + cmd_args = ' -i -e "print(_VERSION)"', + stdin = 'tty', + interactive = true + }, + { + cmd_args = ' -i -e "print(_VERSION)"', + stdin = '/dev/null', + interactive = true + } +} + +local test = tap.test('gh-5040') +test:plan(#commands) + +for _, cmd in pairs(commands) do + local full_cmd = '' + if cmd.stdin == 'tty' then + cmd.stdin = '' + full_cmd = 'ERRINJ_STDIN_ISATTY=1 ' + else + cmd.stdin = '< ' .. cmd.stdin + end + + local full_cmd = full_cmd .. ('%s %s %s %s'):format( + TARANTOOL_PATH, + cmd.cmd_args, + cmd.stdin, + cmd_end + ) + test:test(full_cmd, function(test) + test:plan(cmd.interactive and 1 or 2) + + local pid = tonumber(io.popen(full_cmd):read("*line")) + assert(pid, "pipe error for: " .. cmd.cmd_args) + + local fh = process_timeout.open_with_timeout(output_file, + file_open_timeout) + assert(fh, 'error while opening ' .. output_file) + + if cmd.interactive then + local data = process_timeout.read_with_timeout(fh, + file_read_timeout, + file_read_interval) + test:like(data, 'tarantool>', 'interactive mode detected') + else + local process_completed = process_timeout.wait_process_completion( + pid, + process_waiting_timeout) + test:ok(process_completed, 'process completed') + + -- If empty output expected, then don't wait full file_read_timeout + -- for non-empty output_file, only a little time to be sure that + -- file is empty. + local read_timeout = cmd.empty_output and file_read_interval + or file_read_timeout + local data = process_timeout.read_with_timeout(fh, read_timeout, + file_read_interval) + if cmd.empty_output then + test:ok(#data == 0, 'output is empty') + else + test:unlike(data, 'tarantool>', 'iteractive mode wasn\'t detected') + end + end + if process_timeout.process_is_alive(pid) then ffi.C.kill(pid, 9) end + fh:close() + end) +end + +os.exit(test:check() and 0 or 1) diff --git a/test/box/errinj.result b/test/box/errinj.result index b8c2476c3..a962dbe2d 100644 --- a/test/box/errinj.result +++ b/test/box/errinj.result @@ -74,6 +74,7 @@ evals - ERRINJ_SNAP_COMMIT_DELAY: false - ERRINJ_SNAP_WRITE_DELAY: false - ERRINJ_SQL_NAME_NORMALIZATION: false + - ERRINJ_STDIN_ISATTY: -1 - ERRINJ_SWIM_FD_ONLY: false - ERRINJ_TESTING: false - ERRINJ_TUPLE_ALLOC: false -- 2.28.0