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 CD3DD6EC5B; Mon, 1 Mar 2021 17:48:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CD3DD6EC5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1614610088; bh=Lgvkl8XPt7iLe247WOYfeCegaARKwGLFPgTJgRiLUSI=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=RN1xKsNzwHKCYYLx3Wy8NZCbfhO7Gm11xFvn5khOBbpaVOwEhFYfxLaV2lp75+uRx 4W1bL1gJDa3p6i15F4JDTOvkhuVYT7Z68Pik0E4+OcXqdjLmgn3w1bx2MAwRy645tB YI59cGaIEY1pLO1EylxiuIeWNbjiagGNmtUhdosk= Received: from smtp42.i.mail.ru (smtp42.i.mail.ru [94.100.177.102]) (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 DAED16EC5B for ; Mon, 1 Mar 2021 17:48:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DAED16EC5B Received: by smtp42.i.mail.ru with esmtpa (envelope-from ) id 1lGjq9-0002Uf-Ne; Mon, 01 Mar 2021 17:48:06 +0300 To: Artem Starshov , Alexander Turenko , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org References: <7a1f0cb7a97b41b3cde25ac5d2c591a84aa13f0b.1613674486.git.artemreyt@tarantool.org> Message-ID: <1493e11a-e8ca-6dc0-c4cf-7f8bb4dd0d71@tarantool.org> Date: Mon, 1 Mar 2021 17:47:24 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <7a1f0cb7a97b41b3cde25ac5d2c591a84aa13f0b.1613674486.git.artemreyt@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92A98208ECBDD29F51A014079BC0C7C459F7160AC7246F773182A05F538085040F15B2B579A71D2097DA80B4BF0CBEE8A5DEB35A45633D62AF7FAC471D638515E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE76AB1B6FB25ACEDC9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B0052F7941B60F658638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C25752893F242F32C237D160AF04AB3C4755035ED69DD5CA9A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE77A825AB47F0FC8649FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C327ED053E960B195E117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFA57222E48BFAED24BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B68D179034F22A076476E601842F6C81A1F004C90652538430CDED94BCBF13EF3B93EC92FD9297F6718AA50765F790063700C0D855CCD1F475A7F4EDE966BC389F395957E7521B51C24C7702A67D5C33162DBA43225CD8A89F3D16C27877C51C136D8C47C27EEC5E9FB5C8C57E37DE458B4C7702A67D5C3316FA3894348FB808DB48C21F01D89DB561574AF45C6390F7469DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A5DFB012D9FBAF805DB4CA3434EF1EFCAD3C96E807CE9B0FE5D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75448CF9D3A7B2C848410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34128DEC38EFF4BE5AF05F192EB3E65CD7D0B66D588F9334F5911B1CF9DA334BAD41F4DBC51603F3611D7E09C32AA3244CE40F2882CDC11D5FA2D0BA513D557BC4A995755A1445935E927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnpKwxR6GFbu4Jua/w+LrPA== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769EE1B53A0672D11767DA80B4BF0CBEE8A1E1E156D000DABDBD35D514C7DAC97282D063C67CFD4E84987597EC79699C0E6F21BD4036121A32F7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCHv2 1/2] core: add setting error injections via env 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: Leonid Vasiliev via Tarantool-patches Reply-To: Leonid Vasiliev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" HI! Thank you for the patch. Seems like write a test is more difficult than fixing the bug) Generally OK. I'll paste the last variation of the diff with comments. From c2ff4adb95eda297e61ed6836f391a541ab08fd3 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Artem Starshov Date: Tue, 26 Jan 2021 20:15:22 +0300 Subject: [PATCH 1/2] core: add setting error injections via env Cc: tarantool-patches@dev.tarantool.org Sometimes, it's useful to set error injections via environment variables and this commit adds this opportunity. e.g: `ERRINJ_WAL_WRITE=true tarantool` will be launched with ERRINJ_WAL_WRITE setted to true. Errinjs with bool parameters can be set to "true", "false", "True", "False", "TRUE", "FALSE", etc. (case-insensitive variable). Errinjs with int or double parameters should be whole valid ("123s" is invalid). e.g. for int or double: "123", "-1", "2.34", "+2.34". Part of #5040 --- src/lib/core/errinj.c | 31 +++++++++++++++++ src/lib/core/errinj.h | 5 +++ src/main.cc | 1 + .../errinj_set_with_enviroment_vars.test.lua | 18 ++++++++++ ...errinj_set_with_enviroment_vars_script.lua | 34 +++++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100755 test/box-tap/errinj_set_with_enviroment_vars.test.lua create mode 100644 test/box-tap/errinj_set_with_enviroment_vars_script.lua diff --git a/src/lib/core/errinj.c b/src/lib/core/errinj.c index d3aa0ca4f..983ead681 100644 --- a/src/lib/core/errinj.c +++ b/src/lib/core/errinj.c @@ -28,6 +28,7 @@ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include #include #include #include @@ -66,3 +67,33 @@ int errinj_foreach(errinj_cb cb, void *cb_ctx) { } return 0; } + +void errinj_set_with_environment_vars() { Comment: void errinj_set_with_environment_vars(void) see https://github.com/tarantool/tarantool/issues/4718 + for (enum errinj_id i = 0; i < errinj_id_MAX; i++) { + struct errinj *inj = &errinjs[i]; + const char *env_value = getenv(inj->name); + if (!env_value || *env_value == '\0') Comment: env_value == NULL (https://github.com/tarantool/tarantool/wiki/Code-review-procedure#code-style) + continue; + + if (inj->type == ERRINJ_INT) { + char *end; + int64_t int_value = strtoll(env_value, &end, 10); + if (*end == '\0') + inj->iparam = int_value; Comment: Seems like the `panic()` should be called in the case of `else()`. Here and in other cases of parsing. + } else if (inj->type == ERRINJ_BOOL) { + char *lower_env_value = (char *)calloc(strlen(env_value) + 1, sizeof(char)); Comment: `(char *)` - unneeded in C. Maximal width of a code line is 80 symbols. + for (size_t i = 0; env_value[i]; ++i) + lower_env_value[i] = tolower(env_value[i]); Comment: I suggest to use `strcasecmp()`. + if (strcmp(lower_env_value, "false") == 0) + inj->bparam = false; + else if (strcmp(lower_env_value, "true") == 0) + inj->bparam = true; + free(lower_env_value); + } else if (inj->type == ERRINJ_DOUBLE) { + char *end; + double double_value = strtod(env_value, &end); + if (*end == '\0') + inj->dparam = double_value; + } + } +} diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index 814c57c2e..d76aedf7a 100644 --- a/src/lib/core/errinj.h +++ b/src/lib/core/errinj.h @@ -168,6 +168,11 @@ typedef int (*errinj_cb)(struct errinj *e, void *cb_ctx); int errinj_foreach(errinj_cb cb, void *cb_ctx); +/** + * Set injections by scanning ERRINJ_$(NAME) in environment variables + */ +void errinj_set_with_environment_vars(); + #ifdef NDEBUG # define ERROR_INJECT(ID, CODE) # define ERROR_INJECT_WHILE(ID, CODE) diff --git a/src/main.cc b/src/main.cc index 2fce81bb3..58a660689 100644 --- a/src/main.cc +++ b/src/main.cc @@ -710,6 +710,7 @@ main(int argc, char **argv) memtx_tx_manager_init(); crypto_init(); systemd_init(); + errinj_set_with_environment_vars(); tarantool_lua_init(tarantool_bin, main_argc, main_argv); start_time = ev_monotonic_time(); diff --git a/test/box-tap/errinj_set_with_enviroment_vars.test.lua b/test/box-tap/errinj_set_with_enviroment_vars.test.lua new file mode 100755 index 000000000..bffcc31e7 --- /dev/null +++ b/test/box-tap/errinj_set_with_enviroment_vars.test.lua @@ -0,0 +1,18 @@ +#!/usr/bin/env tarantool +local fio = require('fio') + +-- Execute errinj_set_with_enviroment_vars_script.lua +-- via tarantool with presetted environment variables. +local TARANTOOL_PATH = arg[-1] +local bool_env = 'ERRINJ_TESTING=true ERRINJ_WAL_IO=True ERRINJ_WAL_SYNC=TRUE ' .. + 'ERRINJ_WAL_WRITE=false ERRINJ_INDEX_ALLOC=False ERRINJ_WAL_WRITE_DISK=FALSE' +local integer_env = 'ERRINJ_WAL_WRITE_PARTIAL=2 ERRINJ_WAL_FALLOCATE=+2 ERRINJ_WAL_WRITE_COUNT=-2' +local double_env = 'ERRINJ_VY_READ_PAGE_TIMEOUT=2.5 ERRINJ_VY_SCHED_TIMEOUT=+2.5 ERRINJ_RELAY_TIMEOUT=-2.5' Comment: Maximal width of a code line is 80 symbols. +local set_env_str = ('%s %s %s'):format(bool_env, integer_env, double_env) +local path_to_test_file = fio.pathjoin( + os.getenv('PWD'), + 'box-tap', + 'errinj_set_with_enviroment_vars_script.lua') +local shell_command = ('%s %s %s'):format(set_env_str, TARANTOOL_PATH, path_to_test_file) + +os.exit(os.execute(shell_command)) diff --git a/test/box-tap/errinj_set_with_enviroment_vars_script.lua b/test/box-tap/errinj_set_with_enviroment_vars_script.lua new file mode 100644 index 000000000..f15085aa0 --- /dev/null +++ b/test/box-tap/errinj_set_with_enviroment_vars_script.lua @@ -0,0 +1,34 @@ +-- Script for box-tap/errinj_set_with_enviroment_vars.test.lua test. + +local tap = require('tap') +local errinj = box.error.injection + +local test = tap.test('set errinjs via environment variables') + +test:plan(3) + +test:test('Set boolean error injections', function(test) + test:plan(6) + test:is(errinj.get('ERRINJ_TESTING'), true, 'true') + test:is(errinj.get('ERRINJ_WAL_IO'), true, 'True') + test:is(errinj.get('ERRINJ_WAL_SYNC'), true, 'TRUE') + test:is(errinj.get('ERRINJ_WAL_WRITE'), false, 'false') + test:is(errinj.get('ERRINJ_INDEX_ALLOC'), false, 'False') + test:is(errinj.get('ERRINJ_WAL_WRITE_DISK'), false, 'FALSE') +end) + +test:test('Set integer error injections', function(test) + test:plan(3) + test:is(errinj.get('ERRINJ_WAL_WRITE_PARTIAL'), 2, '2') + test:is(errinj.get('ERRINJ_WAL_FALLOCATE'), 2, '+2') + test:is(errinj.get('ERRINJ_WAL_WRITE_COUNT'), -2, '-2') +end) + +test:test('Set double error injections', function(test) + test:plan(3) + test:is(errinj.get('ERRINJ_VY_READ_PAGE_TIMEOUT'), 2.5, "2.5") + test:is(errinj.get('ERRINJ_VY_SCHED_TIMEOUT'), 2.5, "+2.5") + test:is(errinj.get('ERRINJ_RELAY_TIMEOUT'), -2.5, "-2.5") +end) + +os.exit(test:check() and 0 or 1) -- 2.30.0