Skip to content

Commit 0c6370f

Browse files
committed
TNTP-2109: Add safe mode on/off to test matrix
1 parent 339ca8f commit 0c6370f

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

test/helper.lua

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,16 @@ function helpers.start_cluster(g, cartridge_cfg, vshard_cfg, tarantool3_cluster_
981981
error(err)
982982
end
983983
end
984+
985+
if g.params and g.params.safe_mode ~= nil then
986+
local safe_mod_func = '_crud.rebalance_safe_mode_disable'
987+
if g.params.safe_mode then
988+
safe_mod_func = '_crud.rebalance_safe_mode_enable'
989+
end
990+
helpers.call_on_storages(g.cluster, function(server)
991+
server:call(safe_mod_func)
992+
end)
993+
end
984994
end
985995

986996
local function count_storages_in_topology(g, backend, vshard_group, storage_roles)
@@ -1178,8 +1188,34 @@ function helpers.is_cartridge_suite_supported()
11781188
return is_module_provided and is_tarantool_supports
11791189
end
11801190

1181-
function helpers.backend_matrix(base_matrix)
1191+
function helpers.safe_mode_matrix(base_matrix)
1192+
base_matrix = base_matrix or {{}}
1193+
1194+
local safe_mode_params = {
1195+
{ safe_mode = true },
1196+
{ safe_mode = false },
1197+
}
1198+
1199+
local matrix = {}
1200+
for _, params in ipairs(safe_mode_params) do
1201+
for _, base in ipairs(base_matrix) do
1202+
base = table.deepcopy(base)
1203+
base.safe_mode = params.safe_mode
1204+
table.insert(matrix, base)
1205+
end
1206+
end
1207+
1208+
return matrix
1209+
end
1210+
1211+
function helpers.backend_matrix(base_matrix, opts)
11821212
base_matrix = base_matrix or {{}}
1213+
opts = opts or {}
1214+
1215+
if not opts.skip_safe_mode then
1216+
base_matrix = helpers.safe_mode_matrix(base_matrix)
1217+
end
1218+
11831219
local backend_params = {
11841220
{
11851221
backend = helpers.backend.VSHARD,

test/unit/not_initialized_test.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local server = require('luatest.server')
55

66
local pgroup = t.group('not-initialized', helpers.backend_matrix({
77
{},
8-
}))
8+
}, { skip_safe_mode = true }))
99

1010
local vshard_cfg_template = {
1111
sharding = {

test/unit/stats_test.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ local function enable_stats(g, params)
4545
params = table.deepcopy(params)
4646
params.backend = nil
4747
params.backend_cfg = nil
48+
params.safe_mode = nil
4849
end
4950
g.router:eval("stats_module.enable(...)", { params })
5051
end

0 commit comments

Comments
 (0)