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 5DE6371862; Thu, 4 Mar 2021 12:15:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5DE6371862 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1614849355; bh=tMTO51ZY5L8fxxhUaEtwfVnvjUc1IAQNsyDPLe1MB3I=; 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=jeytCFSLtnH4MO5qOLf2k8LcvHkvrC5a4aN4JA9ChkXVNTgrliBj2a4sCfwbJImZB cHbSTLg3cMKh1IbrB7oqMh/N01f7XEYjC/f2r2sOv2BkEaG0D+c0GiV8BQTcu1m24U j9TrUsbdftHbBwOY7RUo+e7U0TbM9FpWEyeRK0E0= Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) (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 269136B463 for ; Thu, 4 Mar 2021 12:15:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 269136B463 Received: by smtp43.i.mail.ru with esmtpa (envelope-from ) id 1lHk4q-00020V-PG; Thu, 04 Mar 2021 12:15:26 +0300 To: Alexander Turenko , Leonid Vasiliev Date: Thu, 4 Mar 2021 12:15:11 +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: 4F1203BC0FB41BD92A98208ECBDD29F5D89ACCED453B3B3D46194CE92B29E17D182A05F5380850407B49C00109B88533505EEEEC657F3D091E41C03055F31E1AF708EFDC4387074D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE74E2C4641A2CB07F2EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E0942BECCAD85D078638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CDB1C6D2319E1F16744879DB087660FB262C822EC731555FDA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7328B01A8D746D8839FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3E478A468B35FE767117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF7F7E0F90AB0822B4BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B64BFC7504CC67C48976E601842F6C81A1F004C90652538430CDED94BCBF13EF3B93EC92FD9297F6718AA50765F7900637870CFFD37CCFDD3AA7F4EDE966BC389F395957E7521B51C24C7702A67D5C33162DBA43225CD8A89FC0F9454058DFE53CA91E23F1B6B78B78B5C8C57E37DE458B4C7702A67D5C3316FA3894348FB808DB48C21F01D89DB561574AF45C6390F7469DAA53EE0834AAEE X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24A6D60772A99906F8E1CD14B953EB46DE6EDBFA7B260302A355D89D7DBCDD132 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CDB1C6D2319E1F16744879DB087660FB262C822EC731555FD9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF31C0090ACECF247D699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C02783DDD5A45DEF6852A2D0D8964728E088AAA98346BB8C773D64AE0E73725B45518C15F94B7B7F1D7E09C32AA3244CF60FD0AF29B83978BD8896CFAB22CA7C30363D8B7DA7DD4483B48618A63566E0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXgH9yO1rZcQ1lzenTxcudsC X-Mailru-Sender: 65CD03CFE33A0EC7A9E52F902488B1FA441B7E64059FFA19CE4F41710038B28B67C4A0603392C21292F02B39BF137DED0A8ED71B308007E347E5C1256AE813B3E2FBE92986FDCCC89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCHv3 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: 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" 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". NOTE: errinjs 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. Part of #5040 --- src/lib/core/errinj.c | 30 ++++++++++++++++ src/lib/core/errinj.h | 5 +++ src/main.cc | 3 ++ .../errinj_set_with_enviroment_vars.test.lua | 29 ++++++++++++++++ ...errinj_set_with_enviroment_vars_script.lua | 34 +++++++++++++++++++ test/box-tap/suite.ini | 1 + 6 files changed, 102 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..8f76bfac1 100644 --- a/src/lib/core/errinj.c +++ b/src/lib/core/errinj.c @@ -28,9 +28,11 @@ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include #include #include #include +#include #include #include "trivia/config.h" @@ -66,3 +68,31 @@ int errinj_foreach(errinj_cb cb, void *cb_ctx) { } return 0; } + +void errinj_set_with_environment_vars(void) { + 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 == NULL || *env_value == '\0') + continue; + + if (inj->type == ERRINJ_INT) { + char *end; + int64_t int_value = strtoll(env_value, &end, 10); + if (*end == '\0') + inj->iparam = int_value; + } else if (inj->type == ERRINJ_BOOL) { + if (strcasecmp(env_value, "false") == 0) + inj->bparam = false; + else if (strcasecmp(env_value, "true") == 0) + inj->bparam = true; + } else if (inj->type == ERRINJ_DOUBLE) { + char *end; + double double_value = strtod(env_value, &end); + if (*end == '\0') + inj->dparam = double_value; + } else { + panic("Unknown errinj type received"); + } + } +} diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index 814c57c2e..10edbe2b9 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(void); + #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..718180b80 100644 --- a/src/main.cc +++ b/src/main.cc @@ -710,6 +710,9 @@ main(int argc, char **argv) memtx_tx_manager_init(); crypto_init(); systemd_init(); +#ifndef NDEBUG + errinj_set_with_environment_vars(); +#endif 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..8d4ecaedd --- /dev/null +++ b/test/box-tap/errinj_set_with_enviroment_vars.test.lua @@ -0,0 +1,29 @@ +#!/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' +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) diff --git a/test/box-tap/suite.ini b/test/box-tap/suite.ini index a7c03baa8..8ed7fffb9 100644 --- a/test/box-tap/suite.ini +++ b/test/box-tap/suite.ini @@ -4,6 +4,7 @@ description = Database tests with #! using TAP is_parallel = True pretest_clean = True use_unix_sockets_iproto = True +release_disabled = errinj_set_with_enviroment_vars.test.lua config = suite.cfg fragile = { "retries": 10, -- 2.28.0