From: Artem Starshov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCHv2 1/2] core: add setting error injections via env Date: Thu, 18 Feb 2021 22:30:18 +0300 [thread overview] Message-ID: <7a1f0cb7a97b41b3cde25ac5d2c591a84aa13f0b.1613674486.git.artemreyt@tarantool.org> (raw) In-Reply-To: <cover.1613674486.git.artemreyt@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 should be set as "true", "TRUE", "false" or "FALSE". 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 | 26 +++++++++++++++++++ src/lib/core/errinj.h | 5 ++++ src/main.cc | 1 + .../errinj_set_with_enviroment_vars.test.lua | 14 ++++++++++ ...errinj_set_with_enviroment_vars_script.lua | 13 ++++++++++ 5 files changed, 59 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..3c1194f20 100644 --- a/src/lib/core/errinj.c +++ b/src/lib/core/errinj.c @@ -66,3 +66,29 @@ int errinj_foreach(errinj_cb cb, void *cb_ctx) { } return 0; } + +void errinj_set_with_environment_vars() { + 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') + 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 (strcmp(env_value, "false") == 0 || strcmp(env_value, "FALSE") == 0) + inj->bparam = false; + else if (strcmp(env_value, "true") == 0 || strcmp(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; + } + } +} 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..f52ebcc11 --- /dev/null +++ b/test/box-tap/errinj_set_with_enviroment_vars.test.lua @@ -0,0 +1,14 @@ +#!/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 set_env_str = 'ERRINJ_TESTING=true ERRINJ_WAL_WRITE_PARTIAL=1 ERRINJ_VY_READ_PAGE_TIMEOUT=2.5' +local script_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, script_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..b8903b907 --- /dev/null +++ b/test/box-tap/errinj_set_with_enviroment_vars_script.lua @@ -0,0 +1,13 @@ +-- Script for box-tap/errinj_set_with_enviroment_vars.test.lua test. + +local tap = require('tap') +local errinj = box.error.injection + +local res = tap.test('set errinjs via environment variables', function(test) + test:plan(3) + test:is(errinj.get('ERRINJ_TESTING'), true, "set bool error injection") + test:is(errinj.get('ERRINJ_WAL_WRITE_PARTIAL'), 1, "set int error injection") + test:is(errinj.get('ERRINJ_VY_READ_PAGE_TIMEOUT'), 2.5, "set double error injection") +end) + +os.exit(res and 0 or 1) -- 2.28.0
next prev parent reply other threads:[~2021-02-18 19:30 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-18 19:30 [Tarantool-patches] [PATCHv2 0/2] lua: fix tarantool -e always enters interactive mode Artem Starshov via Tarantool-patches 2021-02-18 19:30 ` Artem Starshov via Tarantool-patches [this message] 2021-02-20 9:03 ` [Tarantool-patches] [PATCHv2 1/2] core: add setting error injections via env Sergey Bronnikov via Tarantool-patches 2021-02-20 11:21 ` Artem via Tarantool-patches 2021-02-20 14:27 ` Sergey Bronnikov via Tarantool-patches 2021-02-24 9:38 ` Artem via Tarantool-patches 2021-02-25 14:36 ` Sergey Bronnikov via Tarantool-patches 2021-03-01 14:47 ` Leonid Vasiliev via Tarantool-patches 2021-03-02 17:00 ` Artem via Tarantool-patches 2021-02-18 19:30 ` [Tarantool-patches] [PATCHv2 2/2] lua: fix tarantool -e always enters interactive mode Artem Starshov via Tarantool-patches 2021-02-19 9:15 ` Konstantin Osipov via Tarantool-patches 2021-02-19 14:33 ` Artem via Tarantool-patches 2021-02-20 10:05 ` Sergey Bronnikov via Tarantool-patches 2021-02-20 11:27 ` Artem via Tarantool-patches 2021-03-01 15:10 ` Leonid Vasiliev via Tarantool-patches 2021-03-02 17:05 ` Artem via Tarantool-patches 2021-03-03 12:55 ` Leonid Vasiliev via Tarantool-patches 2021-02-25 14:37 ` [Tarantool-patches] [PATCHv2 0/2] " Sergey Bronnikov via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=7a1f0cb7a97b41b3cde25ac5d2c591a84aa13f0b.1613674486.git.artemreyt@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=artemreyt@tarantool.org \ --cc=sergeyb@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCHv2 1/2] core: add setting error injections via env' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox