[patches] [cfg 1/1] cfg: Add constraints on box.cfg params
imarkov
imarkov at tarantool.org
Thu Feb 22 11:04:17 MSK 2018
From: IlyaMarkovMipt <markovilya197 at gmail.com>
* Introduce limitations on combinations of box.cfg parameters
* Add restriction on log type file and log_nonblock=true
* Add restriction on log type syslog and log_format json
* Each restriction creates error in case of its violation
Relates #3014 #3072
---
src/box/lua/load_cfg.lua | 54 ++++++++++++++++++++++++++++++++
test/app-tap/init_script.result | 2 +-
test/app-tap/init_script.test.lua | 3 +-
test/app-tap/logger.test.lua | 5 +--
test/app/app.lua | 3 +-
test/box-py/box.lua | 3 +-
test/box-tap/auth.test.lua | 1 +
test/box-tap/cfg.test.lua | 21 +++++++++----
test/box-tap/cfgup.test.lua | 3 +-
test/box-tap/session.test.lua | 1 +
test/box-tap/trigger_atexit.test.lua | 1 +
test/box-tap/trigger_yield.test.lua | 3 +-
test/box/admin.result | 2 +-
test/box/backup_test.lua | 2 +-
test/box/box.lua | 1 +
test/box/cfg.result | 4 +--
test/box/lua/cfg_bad_vinyl_dir.lua | 3 +-
test/box/lua/cfg_test1.lua | 1 +
test/box/lua/cfg_test2.lua | 3 +-
test/box/lua/cfg_test3.lua | 1 +
test/box/lua/cfg_test4.lua | 1 +
test/box/proxy.lua | 3 +-
test/box/tiny.lua | 3 +-
test/engine/box.lua | 1 +
test/engine_long/box.lua | 1 +
test/long_run-py/box.lua | 1 +
test/replication-py/failed.lua | 1 +
test/replication-py/master.lua | 1 +
test/replication-py/replica.lua | 1 +
test/replication/autobootstrap.lua | 1 +
test/replication/autobootstrap_guest.lua | 1 +
test/replication/hot_standby.lua | 1 +
test/replication/master.lua | 1 +
test/replication/on_replace.lua | 1 +
test/replication/quorum.lua | 1 +
test/replication/replica.lua | 1 +
test/replication/replica_ack.lua | 1 +
test/replication/replica_timeout.lua | 1 +
test/replication/replica_uuid.lua | 1 +
test/replication/wal_off.lua | 1 +
test/vinyl/bad_run_indexes.lua | 1 +
test/vinyl/force_recovery.lua | 1 +
test/vinyl/info.lua | 1 +
test/vinyl/join_quota.lua | 1 +
test/vinyl/low_quota.lua | 1 +
test/vinyl/upgrade.lua | 1 +
test/vinyl/vinyl.lua | 1 +
test/wal_off/wal.lua | 3 +-
test/xlog-py/box.lua | 3 +-
test/xlog/force_recovery.lua | 3 +-
test/xlog/panic.lua | 3 +-
test/xlog/replica.lua | 1 +
test/xlog/upgrade.lua | 3 +-
test/xlog/xlog.lua | 3 +-
54 files changed, 137 insertions(+), 30 deletions(-)
diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 4ac0408..418bbbe 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -343,6 +343,28 @@ local box_cfg_guard_whitelist = {
NULL = true;
};
+local logger_types = {
+ LOGGER_FILE = 1,
+ LOGGER_PIPE = 2,
+ LOGGER_SYSLOG = 3
+}
+
+local function parse_logger_type(log)
+ if log == nil then
+ return nil
+ end
+ if log:match("^|") or log:match("^pipe:") then
+ return logger_types.LOGGER_PIPE
+ elseif log:match("^syslog:") then
+ return logger_types.LOGGER_SYSLOG
+ elseif log:match("^file:") or not log:match("^:") then
+ return logger_types.LOGGER_FILE
+ else
+ return box.error(box.error.ILLEGAl_PARAMS,
+ "expecting a file name or a prefix, such as '|', 'pipe:', 'syslog:'")
+ end
+end
+
local box = require('box')
-- Move all box members except 'error' to box_configured
local box_configured = {}
@@ -360,6 +382,34 @@ setmetatable(box, {
end
})
+-- List of combinations that are prohibited in cfg
+-- Each combination consists of list of parameters descriptions
+-- Each parameter description includes parameter name, its value and
+-- optionally function that converts box.cfg option to comparable value
+local box_cfg_contrary_combinations = {
+ {{"log_format", "json"}, {"log", logger_types.LOGGER_SYSLOG, parse_logger_type}},
+ {{"log_nonblock", true}, {"log", logger_types.LOGGER_FILE, parse_logger_type}}
+}
+
+local function verify_combinations(contrary_combinations)
+ for _, combination in pairs(contrary_combinations) do
+ local params = {}
+ for _, parameter in pairs(combination) do
+ local value = box.cfg[parameter[1]]
+ if parameter[3] ~= nil then
+ value = parameter[3](value)
+ end
+ if value ~= parameter[2] then
+ goto not_match
+ end
+ table.insert(params, parameter[1])
+ end
+ box.error(box.error.ILLEGAL_PARAMS, "wrong combination of " ..
+ table.concat(params, ", "))
+ ::not_match::
+ end
+end
+
local function load_cfg(cfg)
box.internal.schema.init()
cfg = upgrade_cfg(cfg, translate_cfg)
@@ -371,6 +421,10 @@ local function load_cfg(cfg)
box.cfg = load_cfg -- restore original box.cfg
return box.error() -- re-throw exception from check_cfg()
end
+ if not pcall(verify_combinations, box_cfg_contrary_combinations) then
+ box.cfg = load_cfg
+ return box.error()
+ end
-- Restore box members after initial configuration
for k, v in pairs(box_configured) do
box[k] = v
diff --git a/test/app-tap/init_script.result b/test/app-tap/init_script.result
index 53f87a5..65d3dec 100644
--- a/test/app-tap/init_script.result
+++ b/test/app-tap/init_script.result
@@ -13,7 +13,7 @@ box.cfg
8 log:tarantool.log
9 log_format:plain
10 log_level:5
-11 log_nonblock:true
+11 log_nonblock:false
12 memtx_dir:.
13 memtx_max_tuple_size:1048576
14 memtx_memory:107374182
diff --git a/test/app-tap/init_script.test.lua b/test/app-tap/init_script.test.lua
index 155f149..653e817 100755
--- a/test/app-tap/init_script.test.lua
+++ b/test/app-tap/init_script.test.lua
@@ -6,7 +6,8 @@ box.cfg{
listen = os.getenv("LISTEN"),
pid_file = "box.pid",
memtx_memory=107374182,
- log="tarantool.log"
+ log="tarantool.log",
+ log_nonblock = false
}
yaml = require('yaml')
diff --git a/test/app-tap/logger.test.lua b/test/app-tap/logger.test.lua
index 2d0f333..61488ee 100755
--- a/test/app-tap/logger.test.lua
+++ b/test/app-tap/logger.test.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env tarantool
local test = require('tap').test('log')
-test:plan(22)
+test:plan(21)
--
-- Check that Tarantool creates ADMIN session for #! script
@@ -59,9 +59,6 @@ debug = require('debug')
test:ok(log.info(true) == nil, 'check tarantool crash (gh-2516)')
-s, err = pcall(box.cfg, {log_format='json', log="syslog:identity:tarantool"})
-test:ok(not s, "check json not in syslog")
-
box.cfg{log=filename,
memtx_memory=107374182,
log_format = "json"}
diff --git a/test/app/app.lua b/test/app/app.lua
index 3a0eaa7..74725f8 100644
--- a/test/app/app.lua
+++ b/test/app/app.lua
@@ -4,7 +4,8 @@ box.cfg{
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
pid_file = "tarantool.pid",
- rows_per_wal = 50
+ rows_per_wal = 50,
+ log_nonblock = false
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box-py/box.lua b/test/box-py/box.lua
index 00c592c..ce13c49 100644
--- a/test/box-py/box.lua
+++ b/test/box-py/box.lua
@@ -6,7 +6,8 @@ box.cfg{
memtx_memory = 107374182,
pid_file = "tarantool.pid",
force_recovery = true,
- rows_per_wal = 10
+ rows_per_wal = 10,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box-tap/auth.test.lua b/test/box-tap/auth.test.lua
index 272bd97..bf3c36d 100755
--- a/test/box-tap/auth.test.lua
+++ b/test/box-tap/auth.test.lua
@@ -9,6 +9,7 @@ local urilib = require('uri')
box.cfg {
listen = os.getenv('LISTEN');
log="tarantool.log";
+ log_nonblock=false;
memtx_memory=100*1024*1024;
}
local uri = urilib.parse(box.cfg.listen)
diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua
index 67991ec..fd452b6 100755
--- a/test/box-tap/cfg.test.lua
+++ b/test/box-tap/cfg.test.lua
@@ -6,7 +6,7 @@ local socket = require('socket')
local fio = require('fio')
local uuid = require('uuid')
local msgpack = require('msgpack')
-test:plan(80)
+test:plan(82)
--------------------------------------------------------------------------------
-- Invalid values
@@ -34,6 +34,14 @@ invalid('log', ':')
invalid('log', 'syslog:xxx=')
invalid('log_level', 'unknown')
+local function invalid_combinations(name, val)
+ local status, result = pcall(box.cfg, val)
+ test:ok(not status and result:match('Illegal'), 'invalid '..name)
+end
+
+invalid_combinations("log, log_nonblock", {log = "1.log", log_nonblock = true})
+invalid_combinations("log, log_format", {log = "syslog:identity=tarantool", log_format = 'json'})
+
test:is(type(box.cfg), 'function', 'box is not started')
--------------------------------------------------------------------------------
@@ -66,6 +74,7 @@ test:ok(status and result[1] == 1, "box.tuple without box.cfg")
os.execute("rm -rf vinyl")
box.cfg{
log="tarantool.log",
+ log_nonblock=false,
memtx_memory=104857600,
wal_mode = "", -- "" means default value
}
@@ -150,7 +159,7 @@ function run_script(code)
end
-- gh-715: Cannot switch to/from 'fsync'
-code = [[ box.cfg{ log="tarantool.log", wal_mode = 'fsync' }; ]]
+code = [[ box.cfg{ log="tarantool.log", log_nonblock = false, wal_mode = 'fsync' }; ]]
test:is(run_script(code), 0, 'wal_mode fsync')
code = [[ box.cfg{ wal_mode = 'fsync' }; box.cfg { wal_mode = 'fsync' }; ]]
@@ -177,10 +186,10 @@ test:is(run_script(code), PANIC, 'snap_dir is invalid')
code = [[ box.cfg{ wal_dir='invalid' } ]]
test:is(run_script(code), PANIC, 'wal_dir is invalid')
-test:is(box.cfg.log_nonblock, true, "log_nonblock default value")
+test:is(box.cfg.log_nonblock, false, "log_nonblock default value")
code = [[
-box.cfg{log_nonblock = false }
-os.exit(box.cfg.log_nonblock == false and 0 or 1)
+box.cfg{log_nonblock = true }
+os.exit(box.cfg.log_nonblock == true and 0 or 1)
]]
test:is(run_script(code), 0, "log_nonblock new value")
@@ -293,7 +302,7 @@ test:is(run_script(code), 0, "vinyl_write_threads = 2")
code = [[
box.cfg{slab_alloc_arena = 0.2, slab_alloc_minimal = 16,
slab_alloc_maximal = 64 * 1024}
-os.exit(box.cfg.memtx_memory == 214748364
+os.exit(box.cfg.memtx_memory == 214748364
and box.cfg.memtx_min_tuple_size == 16
and box.cfg.memtx_max_tuple_size == 64 * 1024
and 0 or 1)
diff --git a/test/box-tap/cfgup.test.lua b/test/box-tap/cfgup.test.lua
index 45fc123..68354f7 100755
--- a/test/box-tap/cfgup.test.lua
+++ b/test/box-tap/cfgup.test.lua
@@ -8,7 +8,8 @@ test:plan(3)
config = {
pid_file = '1.pid',
- log="tarantool.log"
+ log="tarantool.log",
+ log_nonblock=false
}
local status = pcall(box.cfg, config)
diff --git a/test/box-tap/session.test.lua b/test/box-tap/session.test.lua
index 6fddced..985e558 100755
--- a/test/box-tap/session.test.lua
+++ b/test/box-tap/session.test.lua
@@ -7,6 +7,7 @@ local fiber = require('fiber')
box.cfg{
listen = os.getenv('LISTEN');
log="tarantool.log";
+ log_nonblock=false;
}
local uri = require('uri').parse(box.cfg.listen)
diff --git a/test/box-tap/trigger_atexit.test.lua b/test/box-tap/trigger_atexit.test.lua
index 59b47aa..5665200 100755
--- a/test/box-tap/trigger_atexit.test.lua
+++ b/test/box-tap/trigger_atexit.test.lua
@@ -14,6 +14,7 @@ box.cfg {
memtx_dir = tempdir,
vinyl_dir = tempdir,
log = fio.pathjoin(tempdir, 'tarantool.log'),
+ log_nonblock = false,
memtx_memory = 104857600 -- for small systems
}
diff --git a/test/box-tap/trigger_yield.test.lua b/test/box-tap/trigger_yield.test.lua
index 0a81eb7..09419e2 100755
--- a/test/box-tap/trigger_yield.test.lua
+++ b/test/box-tap/trigger_yield.test.lua
@@ -2,7 +2,8 @@
box.cfg{
pid_file = "box.pid",
memtx_memory = 104857600,
- log = "tarantool.log"
+ log = "tarantool.log",
+ log_nonblock = false
}
fiber = require('fiber')
diff --git a/test/box/admin.result b/test/box/admin.result
index 13e599e..eee3d5e 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -39,7 +39,7 @@ cfg_filter(box.cfg)
- - log_level
- 5
- - log_nonblock
- - true
+ - false
- - memtx_dir
- <hidden>
- - memtx_max_tuple_size
diff --git a/test/box/backup_test.lua b/test/box/backup_test.lua
index e725ae3..eb7942e 100644
--- a/test/box/backup_test.lua
+++ b/test/box/backup_test.lua
@@ -1,4 +1,4 @@
#!/usr/bin/env tarantool
-box.cfg{listen = os.getenv("LISTEN")}
+box.cfg{listen = os.getenv("LISTEN"), log_nonblock = false}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/box.lua b/test/box/box.lua
index b3b10ff..b2343ae 100644
--- a/test/box/box.lua
+++ b/test/box/box.lua
@@ -5,6 +5,7 @@ box.cfg{
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
pid_file = "tarantool.pid",
+ log_nonblock = false
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/cfg.result b/test/box/cfg.result
index 9f0ad59..9844495 100644
--- a/test/box/cfg.result
+++ b/test/box/cfg.result
@@ -35,7 +35,7 @@ cfg_filter(box.cfg)
- - log_level
- 5
- - log_nonblock
- - true
+ - false
- - memtx_dir
- <hidden>
- - memtx_max_tuple_size
@@ -122,7 +122,7 @@ cfg_filter(box.cfg)
- - log_level
- 5
- - log_nonblock
- - true
+ - false
- - memtx_dir
- <hidden>
- - memtx_max_tuple_size
diff --git a/test/box/lua/cfg_bad_vinyl_dir.lua b/test/box/lua/cfg_bad_vinyl_dir.lua
index 8e1a98d..532ab8c 100644
--- a/test/box/lua/cfg_bad_vinyl_dir.lua
+++ b/test/box/lua/cfg_bad_vinyl_dir.lua
@@ -3,7 +3,8 @@ os = require('os')
box.cfg{
listen = os.getenv("LISTEN"),
- vinyl_dir = 'path/to/nowhere'
+ vinyl_dir = 'path/to/nowhere',
+ log_nonblock = false
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/lua/cfg_test1.lua b/test/box/lua/cfg_test1.lua
index 60b7aff..1d93cfb 100644
--- a/test/box/lua/cfg_test1.lua
+++ b/test/box/lua/cfg_test1.lua
@@ -3,6 +3,7 @@ os = require('os')
box.cfg{
listen = os.getenv("LISTEN"),
+ log_nonblock = false
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/lua/cfg_test2.lua b/test/box/lua/cfg_test2.lua
index 2397f9c..3a02a00 100644
--- a/test/box/lua/cfg_test2.lua
+++ b/test/box/lua/cfg_test2.lua
@@ -3,7 +3,8 @@ os = require('os')
box.cfg{
listen = os.getenv("LISTEN"),
- memtx_memory = 214748364,
+ memtx_memory = 214748364,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/lua/cfg_test3.lua b/test/box/lua/cfg_test3.lua
index 6a6e544..21c8d82 100644
--- a/test/box/lua/cfg_test3.lua
+++ b/test/box/lua/cfg_test3.lua
@@ -5,6 +5,7 @@ box.cfg{
listen = os.getenv("LISTEN"),
memtx_memory = 214748364,
vinyl_write_threads = 10,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/lua/cfg_test4.lua b/test/box/lua/cfg_test4.lua
index 82dab87..c9e51c1 100644
--- a/test/box/lua/cfg_test4.lua
+++ b/test/box/lua/cfg_test4.lua
@@ -5,6 +5,7 @@ box.cfg{
listen = os.getenv("LISTEN"),
slab_alloc_factor = 3.14,
vinyl_memory = 1024 * 1024,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/proxy.lua b/test/box/proxy.lua
index fa87ab8..e8e9de1 100644
--- a/test/box/proxy.lua
+++ b/test/box/proxy.lua
@@ -5,7 +5,8 @@ box.cfg{
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
pid_file = "tarantool.pid",
- rows_per_wal = 50
+ rows_per_wal = 50,
+ log_nonblock = false
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/box/tiny.lua b/test/box/tiny.lua
index 8d30250..10a5ae1 100644
--- a/test/box/tiny.lua
+++ b/test/box/tiny.lua
@@ -7,7 +7,8 @@ box.cfg{
pid_file = "tarantool.pid",
force_recovery = false,
slab_alloc_factor = 1.1,
- rows_per_wal = 5000000
+ rows_per_wal = 5000000,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/engine/box.lua b/test/engine/box.lua
index c68bd62..bfcb1b3 100644
--- a/test/engine/box.lua
+++ b/test/engine/box.lua
@@ -18,6 +18,7 @@ box.cfg{
vinyl_page_size = 1024,
memtx_max_tuple_size = 1024 * 1024 * 100,
vinyl_max_tuple_size = 1024 * 1024 * 100,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/engine_long/box.lua b/test/engine_long/box.lua
index c24eac5..83eba39 100644
--- a/test/engine_long/box.lua
+++ b/test/engine_long/box.lua
@@ -16,6 +16,7 @@ box.cfg {
vinyl_write_threads = 5,
vinyl_range_size = 1024 * 1024,
vinyl_page_size = 4 * 1024,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/long_run-py/box.lua b/test/long_run-py/box.lua
index 8b0738b..a95d80d 100644
--- a/test/long_run-py/box.lua
+++ b/test/long_run-py/box.lua
@@ -13,6 +13,7 @@ box.cfg {
vinyl_dir = "./vinyl_test",
vinyl_read_threads = 3,
vinyl_write_threads = 5,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication-py/failed.lua b/test/replication-py/failed.lua
index ed0ba38..2f116a6 100644
--- a/test/replication-py/failed.lua
+++ b/test/replication-py/failed.lua
@@ -4,6 +4,7 @@ box.cfg({
listen = os.getenv("LISTEN"),
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication-py/master.lua b/test/replication-py/master.lua
index 0f9f7a6..8f9794e 100644
--- a/test/replication-py/master.lua
+++ b/test/replication-py/master.lua
@@ -3,6 +3,7 @@ os = require('os')
box.cfg({
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication-py/replica.lua b/test/replication-py/replica.lua
index 278291b..2addcac 100644
--- a/test/replication-py/replica.lua
+++ b/test/replication-py/replica.lua
@@ -7,6 +7,7 @@ box.cfg({
listen = os.getenv("LISTEN"),
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
+ log_nonblock = false,
})
box_cfg_done = true
diff --git a/test/replication/autobootstrap.lua b/test/replication/autobootstrap.lua
index c96f750..f6c47a3 100644
--- a/test/replication/autobootstrap.lua
+++ b/test/replication/autobootstrap.lua
@@ -15,6 +15,7 @@ require('console').listen(os.getenv('ADMIN'))
box.cfg({
listen = instance_uri(INSTANCE_ID);
+ log_nonblock = false,
-- log_level = 7;
replication = {
USER..':'..PASSWORD..'@'..instance_uri(1);
diff --git a/test/replication/autobootstrap_guest.lua b/test/replication/autobootstrap_guest.lua
index a34ad96..a8c77f0 100644
--- a/test/replication/autobootstrap_guest.lua
+++ b/test/replication/autobootstrap_guest.lua
@@ -14,6 +14,7 @@ require('console').listen(os.getenv('ADMIN'))
box.cfg({
listen = instance_uri(INSTANCE_ID);
+ log_nonblock = false,
-- log_level = 7;
replication = {
instance_uri(1);
diff --git a/test/replication/hot_standby.lua b/test/replication/hot_standby.lua
index aeb4c01..cfa872f 100644
--- a/test/replication/hot_standby.lua
+++ b/test/replication/hot_standby.lua
@@ -9,5 +9,6 @@ box.cfg({
memtx_dir = "master",
vinyl_dir = "master",
hot_standby = true,
+ log_nonblock = false,
})
diff --git a/test/replication/master.lua b/test/replication/master.lua
index 0f9f7a6..e020ccf 100644
--- a/test/replication/master.lua
+++ b/test/replication/master.lua
@@ -3,6 +3,7 @@ os = require('os')
box.cfg({
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/on_replace.lua b/test/replication/on_replace.lua
index 7e49efe..e565863 100644
--- a/test/replication/on_replace.lua
+++ b/test/replication/on_replace.lua
@@ -20,6 +20,7 @@ box.cfg({
USER..':'..PASSWORD..'@'..instance_uri(1);
USER..':'..PASSWORD..'@'..instance_uri(2);
};
+ log_nonblock = false,
})
env = require('test_run')
diff --git a/test/replication/quorum.lua b/test/replication/quorum.lua
index 5138425..f8d1474 100644
--- a/test/replication/quorum.lua
+++ b/test/replication/quorum.lua
@@ -22,6 +22,7 @@ box.cfg({
instance_uri(2);
instance_uri(3);
};
+ log_nonblock = false,
})
box.once("bootstrap", function()
diff --git a/test/replication/replica.lua b/test/replication/replica.lua
index ed0ba38..e5cda00 100644
--- a/test/replication/replica.lua
+++ b/test/replication/replica.lua
@@ -4,6 +4,7 @@ box.cfg({
listen = os.getenv("LISTEN"),
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
+ log_nonblock = false
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/replica_ack.lua b/test/replication/replica_ack.lua
index fcff348..10a3113 100644
--- a/test/replication/replica_ack.lua
+++ b/test/replication/replica_ack.lua
@@ -6,6 +6,7 @@ box.cfg({
memtx_memory = 107374182,
replication_timeout = 0.00001,
replication_connect_quorum = 0,
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/replica_timeout.lua b/test/replication/replica_timeout.lua
index 34fd9f9..7ea37a3 100644
--- a/test/replication/replica_timeout.lua
+++ b/test/replication/replica_timeout.lua
@@ -7,6 +7,7 @@ box.cfg({
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
replication_timeout = TIMEOUT,
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/replica_uuid.lua b/test/replication/replica_uuid.lua
index f92d311..acf8403 100644
--- a/test/replication/replica_uuid.lua
+++ b/test/replication/replica_uuid.lua
@@ -5,6 +5,7 @@ box.cfg({
listen = os.getenv("LISTEN"),
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/wal_off.lua b/test/replication/wal_off.lua
index e56272f..39b9a09 100644
--- a/test/replication/wal_off.lua
+++ b/test/replication/wal_off.lua
@@ -5,6 +5,7 @@ box.cfg({
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
wal_mode = 'none',
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/bad_run_indexes.lua b/test/vinyl/bad_run_indexes.lua
index e214789..1bbdcf6 100644
--- a/test/vinyl/bad_run_indexes.lua
+++ b/test/vinyl/bad_run_indexes.lua
@@ -6,6 +6,7 @@ box.cfg {
listen = os.getenv("LISTEN"),
vinyl_memory = 128 * 1024 * 1024,
force_recovery = true,
+ log_nonblock= false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/force_recovery.lua b/test/vinyl/force_recovery.lua
index 64a3007..3c16c39 100644
--- a/test/vinyl/force_recovery.lua
+++ b/test/vinyl/force_recovery.lua
@@ -4,6 +4,7 @@ box.cfg {
listen = os.getenv("LISTEN"),
vinyl_memory = 128 * 1024 * 1024,
force_recovery = true,
+ log_nonblock= false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/info.lua b/test/vinyl/info.lua
index af31516..519745b 100644
--- a/test/vinyl/info.lua
+++ b/test/vinyl/info.lua
@@ -2,6 +2,7 @@
box.cfg{
vinyl_cache = 15 * 1024, -- 15K to test cache eviction
+ log_nonblock= false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/join_quota.lua b/test/vinyl/join_quota.lua
index d371abf..dc26ce6 100644
--- a/test/vinyl/join_quota.lua
+++ b/test/vinyl/join_quota.lua
@@ -5,6 +5,7 @@ box.cfg({
replication = os.getenv("MASTER"),
vinyl_memory = 1024 * 1024,
vinyl_timeout = 0.001,
+ log_nonblock= false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/low_quota.lua b/test/vinyl/low_quota.lua
index 2426d06..c802ec2 100644
--- a/test/vinyl/low_quota.lua
+++ b/test/vinyl/low_quota.lua
@@ -5,6 +5,7 @@ local LIMIT = tonumber(arg[1])
box.cfg{
vinyl_memory = LIMIT,
vinyl_max_tuple_size = 2 * LIMIT,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/upgrade.lua b/test/vinyl/upgrade.lua
index 2853492..b6c01d9 100644
--- a/test/vinyl/upgrade.lua
+++ b/test/vinyl/upgrade.lua
@@ -2,6 +2,7 @@
box.cfg{
listen = os.getenv("LISTEN"),
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/vinyl/vinyl.lua b/test/vinyl/vinyl.lua
index 34bd948..21d0e31 100644
--- a/test/vinyl/vinyl.lua
+++ b/test/vinyl/vinyl.lua
@@ -14,6 +14,7 @@ box.cfg {
vinyl_run_size_ratio = 2,
vinyl_cache = 10240, -- 10kB
vinyl_max_tuple_size = 1024 * 1024 * 6,
+ log_nonblock=false,
}
function box_info_sort(data)
diff --git a/test/wal_off/wal.lua b/test/wal_off/wal.lua
index 6e4afbe..23dd3c0 100644
--- a/test/wal_off/wal.lua
+++ b/test/wal_off/wal.lua
@@ -4,7 +4,8 @@ box.cfg{
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
pid_file = "tarantool.pid",
- wal_mode = "none"
+ wal_mode = "none",
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog-py/box.lua b/test/xlog-py/box.lua
index 00c592c..06d5b29 100644
--- a/test/xlog-py/box.lua
+++ b/test/xlog-py/box.lua
@@ -6,7 +6,8 @@ box.cfg{
memtx_memory = 107374182,
pid_file = "tarantool.pid",
force_recovery = true,
- rows_per_wal = 10
+ rows_per_wal = 10,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog/force_recovery.lua b/test/xlog/force_recovery.lua
index ee429ba..4e5a5e8 100644
--- a/test/xlog/force_recovery.lua
+++ b/test/xlog/force_recovery.lua
@@ -2,7 +2,8 @@
box.cfg {
listen = os.getenv("LISTEN"),
- force_recovery = true
+ force_recovery = true,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog/panic.lua b/test/xlog/panic.lua
index dee83e6..807c855 100644
--- a/test/xlog/panic.lua
+++ b/test/xlog/panic.lua
@@ -6,7 +6,8 @@ box.cfg{
memtx_memory = 107374182,
pid_file = "tarantool.pid",
force_recovery = false,
- rows_per_wal = 10
+ rows_per_wal = 10,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog/replica.lua b/test/xlog/replica.lua
index b76c2f7..03494ac 100644
--- a/test/xlog/replica.lua
+++ b/test/xlog/replica.lua
@@ -6,6 +6,7 @@ box.cfg({
memtx_memory = 107374182,
-- pid_file = "tarantool.pid",
-- logger = "tarantool.log",
+ log_nonblock = false,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog/upgrade.lua b/test/xlog/upgrade.lua
index dcf59e1..f1cfd90 100644
--- a/test/xlog/upgrade.lua
+++ b/test/xlog/upgrade.lua
@@ -2,7 +2,8 @@
box.cfg {
listen = os.getenv("LISTEN"),
- memtx_memory = 107374182
+ memtx_memory = 107374182,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/xlog/xlog.lua b/test/xlog/xlog.lua
index b1c9719..4c427bb 100644
--- a/test/xlog/xlog.lua
+++ b/test/xlog/xlog.lua
@@ -7,7 +7,8 @@ box.cfg{
pid_file = "tarantool.pid",
force_recovery = true,
rows_per_wal = 10,
- snap_io_rate_limit = 16
+ snap_io_rate_limit = 16,
+ log_nonblock = false,
}
require('console').listen(os.getenv('ADMIN'))
--
2.7.4
More information about the Tarantool-patches
mailing list