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 4ADBC6F3C0; Thu, 11 Mar 2021 15:06:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4ADBC6F3C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615464415; bh=ufBoxhzqhQjokGoC+iosqiSD6KAOXxtkwEM+AGHQhdM=; 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=bOi9Ulge+u3x2VRRfxRewPF5DvLaEG3DamntyMn1tMRzV7ll3aMK8m9x2Vukj+pgc JrryubQuXgvkV4gLgz+wVfBrItMSoKS5rd98xu6tsHUe657kvUZNzD68XE1TksWBb8 z+kbfO1e9LwcwVESYF8/Hk9E5Z91+9qSQ4kHtbn0= 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 208EB6F3C2 for ; Thu, 11 Mar 2021 15:05:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 208EB6F3C2 Received: by smtp56.i.mail.ru with esmtpa (envelope-from ) id 1lKK4g-0001W0-Vc; Thu, 11 Mar 2021 15:05:55 +0300 To: Alexander Turenko , Leonid Vasiliev Date: Thu, 11 Mar 2021 15:05:49 +0300 Message-Id: <728b5c11a03ade944d401fb36e522a12eba8e5f4.1615463815.git.artemreyt@tarantool.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69B26D8F72E9B1572BA8E4C181D918FF7DF00894C459B0CD1B97D036BF902C0CC50000925DD91BC353D66ECB7D3664F72D4F387DE8544A20E12 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7235646FAB97B4BEDEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373DBA3D7E24987517EA1F7E6F0F101C67CDEEF6D7F21E0D1D174C73DBBBFC7664A9B589C57B9CBD9529B0B53FE5161B377A07CF05FFABA57E389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0D9442B0B5983000E8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B636DA1BED736F9328CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249D78B04499ED8281576E601842F6C81A12EF20D2F80756B5F7E9C4E3C761E06A776E601842F6C81A127C277FBC8AE2E8B694C66C2E5B4589D3AA81AA40904B5D9DBF02ECDB25306B2B25CBF701D1BE8734AD6D5ED66289B5278DA827A17800CE77DCDFB3399A2F72893EC92FD9297F6715571747095F342E857739F23D657EF2BD5E8D9A59859A8B64D263EB3BC80FB53089D37D7C0E48F6C5571747095F342E857739F23D657EF2B6825BDBE14D8E7028C9DFF55498CEFB0BD9CCCA9EDD067B1EDA766A37F9254B7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C11F5982A89E0728CC18409CAF1EEEB707102DC06321760649C2B6934AE262D3EE7EAB7254005DCED114C52B35DBB74F4E7EAB7254005DCEDA5DF9383870C0FED1E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0BDBC62CB1440F3B18E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3468964757141B82E0E70DFF1F56FD18C1915D55A6BCE816CFC33F4AA51B519BD6CC11CDB98791CCAB1D7E09C32AA3244C0B6796BCCF4595B10B03E4929B023E03A8CE788DE683120583B48618A63566E0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXgFkAEGrNTi7xM5Co/6qEKN X-Mailru-Sender: 65CD03CFE33A0EC78F35AC4B367C11FE1DF95D4796EC6876651945E9240E54518EBC2AC92E4C644F92F02B39BF137DED0A8ED71B308007E347E5C1256AE813B3E2FBE92986FDCCC89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCHv4 2/2] 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). NOTE: test for this code fix uses errinjs, and the last one should work only in debug mode, so added `release_disabled` in suite.ini. But there is a bug in test-run: `release_disable` disables tests at each build type. Partially this problem is descripted in tarantool/test-run#199. Fixes #5040 --- .../unreleased/fix-tarantool-e-option.md | 6 + src/lib/core/errinj.h | 1 + src/lua/init.c | 27 +++- ...5040-inter-mode-isatty-via-errinj.test.lua | 126 ++++++++++++++++++ test/app-tap/suite.ini | 1 + test/box/errinj.result | 1 + 6 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/fix-tarantool-e-option.md create mode 100755 test/app-tap/gh-5040-inter-mode-isatty-via-errinj.test.lua diff --git a/changelogs/unreleased/fix-tarantool-e-option.md b/changelogs/unreleased/fix-tarantool-e-option.md new file mode 100644 index 000000000..ebabe8c78 --- /dev/null +++ b/changelogs/unreleased/fix-tarantool-e-option.md @@ -0,0 +1,6 @@ +## bugfix/lua + +* Fixed -e option, when tarantool always entered interactive mode + when stdin is a tty. Now, `tarantool -e 'print"Hello"'` doesn't + enter interactive mode as it was before, just prints 'Hello' and + exits (gh-5040). diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index 10edbe2b9..f131a5cf6 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..4729ad7a2 100644 --- a/src/lua/init.c +++ b/src/lua/init.c @@ -62,6 +62,7 @@ #include "lua/swim.h" #include "lua/decimal.h" #include "digest.h" +#include "errinj.h" #include #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 is_option_e_ran = 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); + is_option_e_ran = true; break; default: unreachable(); /* checked by getopt() in main() */ @@ -627,25 +630,41 @@ run_script_f(va_list ap) fiber_sleep(0.0); aux_loop_is_run = true; + /* + * Override return value of isatty(STDIN_FILENO) if + * ERRINJ_STDIN_ISATTY enabled (iparam not set to default). + * Use iparam in such case, standard return value otherwise. + * Integer param of errinj is used in order to set different + * return values. + */ + int is_a_tty; + struct errinj *inj = errinj(ERRINJ_STDIN_ISATTY, ERRINJ_INT); + if (inj != NULL && inj->iparam >= 0) { + is_a_tty = inj->iparam; + } else { + is_a_tty = 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_a_tty || (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 (!is_option_e_ran) { 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-inter-mode-isatty-via-errinj.test.lua b/test/app-tap/gh-5040-inter-mode-isatty-via-errinj.test.lua new file mode 100755 index 000000000..25e2bbc5e --- /dev/null +++ b/test/app-tap/gh-5040-inter-mode-isatty-via-errinj.test.lua @@ -0,0 +1,126 @@ +#!/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 using error injections +-- to change return value of isatty(stdin). +-- + +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 testcase 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 testcases = { + { + 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(#testcases) +for _, cmd in pairs(testcases) 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() + os.remove(output_file) + end) +end + +os.exit(test:check() and 0 or 1) diff --git a/test/app-tap/suite.ini b/test/app-tap/suite.ini index ccf828503..f791ddc5e 100644 --- a/test/app-tap/suite.ini +++ b/test/app-tap/suite.ini @@ -5,6 +5,7 @@ lua_libs = lua/require_mod.lua lua/serializer_test.lua lua/process_timeout.lua is_parallel = True pretest_clean = True use_unix_sockets_iproto = True +release_disabled = gh-5040-inter-mode-isatty-via-errinj.test.lua fragile = { "retries": 10, "tests": { 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