diff --git a/test/replication-luatest/bootstrap_strategy_test.lua b/test/replication-luatest/bootstrap_strategy_test.lua
index 9d33e8a7cca892065fdf38db8627974ce53e3c77..632798d983435d2199ae8fd812d2faff8c9c51c5 100644
--- a/test/replication-luatest/bootstrap_strategy_test.lua
+++ b/test/replication-luatest/bootstrap_strategy_test.lua
@@ -39,8 +39,8 @@ g_auto.before_test('test_auto_bootstrap_waits_for_confirmations', function(cg)
cg.replica_set = replica_set:new{}
cg.box_cfg = {
replication = {
- server.build_listen_uri('server_bs_1'),
- server.build_listen_uri('server_bs_2'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
},
replication_connect_timeout = 1000,
replication_timeout = 0.1,
@@ -48,18 +48,18 @@ g_auto.before_test('test_auto_bootstrap_waits_for_confirmations', function(cg)
-- Make server1 the bootstrap leader.
cg.box_cfg.instance_uuid = uuid1
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = cg.box_cfg,
}
- cg.box_cfg.replication[3] = server.build_listen_uri('server_bs_3')
+ cg.box_cfg.replication[3] = server.build_listen_uri('server3')
cg.box_cfg.instance_uuid = uuid2
cg.server2 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_2',
+ alias = 'server2',
box_cfg = cg.box_cfg,
}
cg.box_cfg.instance_uuid = uuid3
cg.server3 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_3',
+ alias = 'server3',
box_cfg = cg.box_cfg,
}
end)
@@ -82,19 +82,19 @@ g_auto.before_test('test_join_checks_fullmesh', function(cg)
cg.replica_set = replica_set:new{}
cg.box_cfg = {
replication = {
- server.build_listen_uri('server_bs_1'),
- server.build_listen_uri('server_bs_2'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
},
replication_timeout = 0.1,
}
cg.box_cfg.instance_uuid = uuid1
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = cg.box_cfg,
}
cg.box_cfg.instance_uuid = uuid2
cg.server2 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_2',
+ alias = 'server2',
box_cfg = cg.box_cfg,
}
cg.replica_set:start()
@@ -103,11 +103,11 @@ end)
g_auto.test_join_checks_fullmesh = function(cg)
cg.box_cfg.replication[2] = nil
cg.server3 = cg.replica_set:build_server{
- alias = 'server_bs_3',
+ alias = 'server3',
box_cfg = cg.box_cfg,
}
cg.server3:start{wait_until_ready = false}
- local logfile = fio.pathjoin(cg.server3.workdir, 'server_bs_3.log')
+ local logfile = fio.pathjoin(cg.server3.workdir, 'server3.log')
local uuid_pattern = uuid2:gsub('%-', '%%-')
local pattern = 'No connection to ' .. uuid_pattern
t.helpers.retrying({}, function()
@@ -190,11 +190,11 @@ end)
g_config.before_test('test_no_replication', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
replication_timeout = 0.1,
bootstrap_strategy = 'config',
- bootstrap_leader = server.build_listen_uri('server_bs_1'),
+ bootstrap_leader = server.build_listen_uri('server1'),
replication = nil
},
}
@@ -204,7 +204,7 @@ local no_leader_msg = 'failed to connect to the bootstrap leader'
g_config.test_no_replication = function(cg)
cg.replica_set:start{wait_until_ready = false}
- local logfile = fio.pathjoin(cg.server1.workdir, 'server_bs_1.log')
+ local logfile = fio.pathjoin(cg.server1.workdir, 'server1.log')
t.helpers.retrying({}, function()
t.assert(server:grep_log(no_leader_msg, nil, {filename = logfile}))
end)
@@ -213,7 +213,7 @@ end
g_config.before_test('test_uuid', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
bootstrap_strategy = 'config',
bootstrap_leader = uuid1,
@@ -238,18 +238,18 @@ end)
g_config.before_test('test_replication_without_bootstrap_leader', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
replication_timeout = 0.1,
bootstrap_strategy = 'config',
- bootstrap_leader = server.build_listen_uri('server_bs_1'),
+ bootstrap_leader = server.build_listen_uri('server1'),
replication = {
- server.build_listen_uri('server_bs_2'),
+ server.build_listen_uri('server2'),
},
},
}
cg.server2 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_2',
+ alias = 'server2',
box_cfg = {
replication_timeout = 0.1,
},
@@ -258,7 +258,7 @@ end)
g_config.test_replication_without_bootstrap_leader = function(cg)
cg.replica_set:start{wait_until_ready = false}
- local logfile = fio.pathjoin(cg.server1.workdir, 'server_bs_1.log')
+ local logfile = fio.pathjoin(cg.server1.workdir, 'server1.log')
t.helpers.retrying({}, function()
t.assert(server:grep_log(no_leader_msg, nil, {filename = logfile}))
end)
@@ -280,12 +280,12 @@ local set_log_before_cfg = [[
g_config.before_test('test_no_leader', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
replication_timeout = 0.1,
bootstrap_strategy = 'config',
bootstrap_leader = nil,
- replication = server.build_listen_uri('server_bs_1'),
+ replication = server.build_listen_uri('server1'),
},
env = {
['TARANTOOL_RUN_BEFORE_BOX_CFG'] = set_log_before_cfg,
@@ -295,7 +295,7 @@ end)
g_config.test_no_leader = function(cg)
cg.replica_set:start{wait_until_ready = false}
- local logfile = fio.pathjoin(cg.server1.workdir, 'server_bs_1.log')
+ local logfile = fio.pathjoin(cg.server1.workdir, 'server1.log')
local empty_leader_msg = "the option can't be empty when bootstrap " ..
"strategy is 'config'"
t.helpers.retrying({}, function()
@@ -306,12 +306,12 @@ end
g_config.before_test('test_single_leader', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
replication_timeout = 0.1,
bootstrap_strategy = 'config',
- bootstrap_leader = server.build_listen_uri('server_bs_1'),
- replication = server.build_listen_uri('server_bs_1'),
+ bootstrap_leader = server.build_listen_uri('server1'),
+ replication = server.build_listen_uri('server1'),
},
}
end)
@@ -329,14 +329,14 @@ g_config.after_test('test_single_leader', function(cg)
end)
local g_config_success = t.group('gh-7999-bootstrap-strategy-config-success', {
- {leader = 'server_bs_3'},
+ {leader = 'server3'},
{leader = uuid3},
})
g_config_success.before_each(function(cg)
cg.leader = cg.params.leader
-- cg.params can't have "/" for some reason, so recreate the path here.
- if string.match(cg.leader, 'server_bs_3') then
+ if string.match(cg.leader, 'server3') then
cg.leader = server.build_listen_uri(cg.leader)
end
end)
@@ -348,22 +348,22 @@ end)
g_config_success.before_test('test_correct_bootstrap_leader', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
bootstrap_strategy = 'config',
bootstrap_leader = cg.leader,
instance_uuid = uuid1,
replication = {
- server.build_listen_uri('server_bs_1'),
- server.build_listen_uri('server_bs_2'),
- server.build_listen_uri('server_bs_3'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
+ server.build_listen_uri('server3'),
},
replication_timeout = 0.1,
},
}
cg.replica_set_a = replica_set:new{}
cg.server2 = cg.replica_set_a:build_and_add_server{
- alias = 'server_bs_2',
+ alias = 'server2',
box_cfg = {
replicaset_uuid = uuida,
instance_uuid = uuid2,
@@ -371,12 +371,12 @@ g_config_success.before_test('test_correct_bootstrap_leader', function(cg)
}
cg.replica_set_b = replica_set:new{}
cg.server3 = cg.replica_set_b:build_and_add_server{
- alias = 'server_bs_3',
+ alias = 'server3',
box_cfg = {
replicaset_uuid = uuidb,
instance_uuid = uuid3,
listen = {
- server.build_listen_uri('server_bs_3'),
+ server.build_listen_uri('server3'),
},
},
}
@@ -401,14 +401,14 @@ end
g_config_success.before_test('test_wait_only_for_leader', function(cg)
cg.replica_set = replica_set:new{}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_1',
+ alias = 'server1',
box_cfg = {
bootstrap_strategy = 'config',
bootstrap_leader = cg.leader,
replication = {
- server.build_listen_uri('server_bs_1'),
+ server.build_listen_uri('server1'),
server.build_listen_uri('unreachable_2'),
- server.build_listen_uri('server_bs_3'),
+ server.build_listen_uri('server3'),
server.build_listen_uri('unreachable_4'),
},
replication_connect_timeout = 1000,
@@ -416,12 +416,12 @@ g_config_success.before_test('test_wait_only_for_leader', function(cg)
},
}
cg.server3 = cg.replica_set:build_and_add_server{
- alias = 'server_bs_3',
+ alias = 'server3',
box_cfg = {
replicaset_uuid = uuidb,
instance_uuid = uuid3,
listen = {
- server.build_listen_uri('server_bs_3'),
+ server.build_listen_uri('server3'),
},
},
}
diff --git a/test/replication-luatest/election_fencing_test.lua b/test/replication-luatest/election_fencing_test.lua
index 058d193211e8527e1efe51c695db319068ced3b2..381ee4689c1314a7031ab09dd67735a794949b38 100644
--- a/test/replication-luatest/election_fencing_test.lua
+++ b/test/replication-luatest/election_fencing_test.lua
@@ -3,10 +3,10 @@ local cluster = require('luatest.replica_set')
local server = require('luatest.server')
local g_async = luatest.group('fencing_async', {
- {mode = 'manual'}, {mode = 'candidate'}})
+ {election_mode = 'manual'}, {election_mode = 'candidate'}})
local g_sync = luatest.group('fencing_sync')
local g_mode = luatest.group('fencing_mode', {
- {mode = 'soft'}, {mode = 'strict'}})
+ {election_fencing_mode = 'soft'}, {election_fencing_mode = 'strict'}})
local SHORT_TIMEOUT = 0.1
local LONG_TIMEOUT = 1000
@@ -61,20 +61,13 @@ local function box_cfg_update(servers, cfg)
end
local function start(g)
- local suffix
- if g.params then
- suffix = g.params.mode
- else
- suffix = g.name
- end
-
g.box_cfg = {
election_mode = 'manual',
election_timeout = SHORT_TIMEOUT,
replication = {
- server.build_listen_uri('server_1_' .. suffix),
- server.build_listen_uri('server_2_' .. suffix),
- server.build_listen_uri('server_3_' .. suffix),
+ server.build_listen_uri('server_1'),
+ server.build_listen_uri('server_2'),
+ server.build_listen_uri('server_3'),
},
replication_synchro_quorum = 2,
replication_synchro_timeout = SHORT_TIMEOUT,
@@ -83,13 +76,13 @@ local function start(g)
g.cluster = cluster:new({})
g.server_1 = g.cluster:build_and_add_server(
- {alias = 'server_1_' .. suffix, box_cfg = g.box_cfg})
+ {alias = 'server_1', box_cfg = g.box_cfg})
g.box_cfg.read_only = true
g.server_2 = g.cluster:build_and_add_server(
- {alias = 'server_2_' .. suffix, box_cfg = g.box_cfg})
+ {alias = 'server_2', box_cfg = g.box_cfg})
g.server_3 = g.cluster:build_and_add_server(
- {alias = 'server_3_' .. suffix, box_cfg = g.box_cfg})
+ {alias = 'server_3', box_cfg = g.box_cfg})
g.cluster:start()
g.cluster:wait_for_fullmesh()
@@ -116,7 +109,7 @@ g_async.after_each(function(g)
end)
g_async.test_fencing = function(g)
- box_cfg_update({g.server_1}, {election_mode = g.params.mode})
+ box_cfg_update({g.server_1}, {election_mode = g.params.election_mode})
g.server_1:exec(function()
box.schema.create_space('test'):create_index('pk')
end)
@@ -303,20 +296,19 @@ g_mode.after_all(stop)
g_mode.test_fencing_mode = function(g)
local timeout = 0.5
box_cfg_update({g.server_1, g.server_2}, {
- election_fencing_mode = g.params.mode,
+ election_fencing_mode = g.params.election_fencing_mode,
replication_timeout = timeout,
})
local proxy = require('luatest.replica_proxy'):new({
- client_socket_path = server.build_listen_uri(
- g.server_1.alias .. '_proxy'),
- server_socket_path = server.build_listen_uri(g.server_1.alias),
+ client_socket_path = server.build_listen_uri('server_1_proxy'),
+ server_socket_path = server.build_listen_uri('server_1'),
})
proxy:start({force = true})
local proxied_replication = {
- server.build_listen_uri(g.server_1.alias .. '_proxy'),
- server.build_listen_uri(g.server_2.alias),
+ server.build_listen_uri('server_1_proxy'),
+ server.build_listen_uri('server_2'),
}
box_cfg_update({g.server_2}, {replication = {}})
@@ -343,7 +335,7 @@ g_mode.test_fencing_mode = function(g)
return box.info.replication[leader_id].upstream.status
end, {leader_id})
- if g.params.mode == 'strict' then
+ if g.params.election_fencing_mode == 'strict' then
luatest.assert_equals(follower_connection_status, 'follow',
'Follower did not notice leader disconnection')
else
diff --git a/test/replication-luatest/gh_6033_box_promote_demote_test.lua b/test/replication-luatest/gh_6033_box_promote_demote_test.lua
index 66f078ed3333926cf0dc4626827126daca9798eb..d98a2e723bb1a7932578d320d1adffc5b60a4d1b 100644
--- a/test/replication-luatest/gh_6033_box_promote_demote_test.lua
+++ b/test/replication-luatest/gh_6033_box_promote_demote_test.lua
@@ -92,15 +92,15 @@ local function cluster_init(g)
replication_synchro_timeout = 5,
replication_synchro_quorum = 1,
replication = {
- server.build_listen_uri('server_gh6033_1'),
- server.build_listen_uri('server_gh6033_2'),
+ server.build_listen_uri('server_1'),
+ server.build_listen_uri('server_2'),
},
}
g.server_1 = g.cluster:build_and_add_server(
- {alias = 'server_gh6033_1', box_cfg = g.box_cfg})
+ {alias = 'server_1', box_cfg = g.box_cfg})
g.server_2 = g.cluster:build_and_add_server(
- {alias = 'server_gh6033_2', box_cfg = g.box_cfg})
+ {alias = 'server_2', box_cfg = g.box_cfg})
g.cluster:start()
g.cluster:wait_for_fullmesh()
end
@@ -387,13 +387,13 @@ g_common.test_limbo_full_interfering_promote = function(g)
-- server_2 will interrupt server_1, while server_3 is leader
local box_cfg = table.copy(g.box_cfg)
box_cfg.replication = {
- server.build_listen_uri('server_gh6033_1'),
- server.build_listen_uri('server_gh6033_2'),
- server.build_listen_uri('server_gh6033_3'),
+ server.build_listen_uri('server_1'),
+ server.build_listen_uri('server_2'),
+ server.build_listen_uri('server_3'),
}
local server_3 = g.cluster:build_server(
- {alias = 'server_gh6033_3', box_cfg = box_cfg})
+ {alias = 'server_3', box_cfg = box_cfg})
server_3:start()
wait_sync({g.server_1, g.server_2, server_3})
box_cfg_update(g.cluster.servers, box_cfg)
diff --git a/test/replication-luatest/gh_6754_promote_before_new_term_test.lua b/test/replication-luatest/gh_6754_promote_before_new_term_test.lua
index a86236dbe6c3bd861e3d4ed61e292d6f8c4c30cc..18d1aaeb450d5b132a1380fc1056ab3554a220d4 100644
--- a/test/replication-luatest/gh_6754_promote_before_new_term_test.lua
+++ b/test/replication-luatest/gh_6754_promote_before_new_term_test.lua
@@ -13,18 +13,18 @@ g.before_all(function(g)
replication_synchro_quorum = 1,
replication_timeout = 0.1,
replication = {
- server.build_listen_uri('server_gh6754_1'),
- server.build_listen_uri('server_gh6754_2'),
+ server.build_listen_uri('server_1'),
+ server.build_listen_uri('server_2'),
},
}
g.server_1 = g.cluster:build_and_add_server(
- {alias = 'server_gh6754_1', box_cfg = g.box_cfg})
+ {alias = 'server_1', box_cfg = g.box_cfg})
g.box_cfg.read_only = false
g.server_2 = g.cluster:build_and_add_server(
- {alias = 'server_gh6754_2', box_cfg = g.box_cfg})
+ {alias = 'server_2', box_cfg = g.box_cfg})
g.cluster:start()
g.cluster:wait_for_fullmesh()
end)
diff --git a/test/replication-luatest/gh_6842_qsync_applier_order_test.lua b/test/replication-luatest/gh_6842_qsync_applier_order_test.lua
index b43958e74ee7952a43a680a9f7b602f3b8747983..d65b59bf4a71ff2501248a2b858d7d87b1537a87 100644
--- a/test/replication-luatest/gh_6842_qsync_applier_order_test.lua
+++ b/test/replication-luatest/gh_6842_qsync_applier_order_test.lua
@@ -13,17 +13,17 @@ local function cluster_create(g)
replication_synchro_quorum = 2,
replication_synchro_timeout = 1000,
replication = {
- server.build_listen_uri('server_gh6842_1'),
- server.build_listen_uri('server_gh6842_2'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
},
}
g.server1 = g.cluster:build_and_add_server({
- alias = 'server_gh6842_1', box_cfg = box_cfg
+ alias = 'server1', box_cfg = box_cfg
})
-- For stability. To guarantee server1 is first, server2 is second.
box_cfg.read_only = true
g.server2 = g.cluster:build_and_add_server({
- alias = 'server_gh6842_2', box_cfg = box_cfg
+ alias = 'server2', box_cfg = box_cfg
})
g.cluster:start()
diff --git a/test/replication-luatest/gh_7086_box_issue_promote_assert_test.lua b/test/replication-luatest/gh_7086_box_issue_promote_assert_test.lua
index 24235d368fd44f8f3d5a969d5349b711c38cef8a..cf309c161d0853b7009f472c5b7297aef4856954 100644
--- a/test/replication-luatest/gh_7086_box_issue_promote_assert_test.lua
+++ b/test/replication-luatest/gh_7086_box_issue_promote_assert_test.lua
@@ -25,18 +25,18 @@ local function cluster_init(g)
replication_synchro_timeout = 5,
replication_synchro_quorum = 1,
replication = {
- server.build_listen_uri('server_gh7086_1'),
- server.build_listen_uri('server_gh7086_2'),
- server.build_listen_uri('server_gh7086_3'),
+ server.build_listen_uri('server_1'),
+ server.build_listen_uri('server_2'),
+ server.build_listen_uri('server_3'),
},
}
g.server_1 = g.cluster:build_and_add_server(
- {alias = 'server_gh7086_1', box_cfg = g.box_cfg})
+ {alias = 'server_1', box_cfg = g.box_cfg})
g.server_2 = g.cluster:build_and_add_server(
- {alias = 'server_gh7086_2', box_cfg = g.box_cfg})
+ {alias = 'server_2', box_cfg = g.box_cfg})
g.server_3 = g.cluster:build_and_add_server(
- {alias = 'server_gh7086_3', box_cfg = g.box_cfg})
+ {alias = 'server_3', box_cfg = g.box_cfg})
g.cluster:start()
g.cluster:wait_for_fullmesh()
end
diff --git a/test/replication-luatest/gh_7253_election_long_wal_write_test.lua b/test/replication-luatest/gh_7253_election_long_wal_write_test.lua
index 82a705c1812c1be7699f9a8209c89159013d6ff0..a8d8b792c262d36b00a3798f9f81829601f9ae78 100644
--- a/test/replication-luatest/gh_7253_election_long_wal_write_test.lua
+++ b/test/replication-luatest/gh_7253_election_long_wal_write_test.lua
@@ -74,22 +74,22 @@ g.before_all(function(g)
election_timeout = 1000,
election_fencing_enabled = false,
replication = {
- server.build_listen_uri('server_gh7253_1'),
- server.build_listen_uri('server_gh7253_2'),
- server.build_listen_uri('server_gh7253_3'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
+ server.build_listen_uri('server3'),
},
bootstrap_strategy = 'legacy',
}
box_cfg.election_mode = 'manual'
g.server1 = g.cluster:build_and_add_server({
- alias = 'server_gh7253_1', box_cfg = box_cfg
+ alias = 'server1', box_cfg = box_cfg
})
box_cfg.election_mode = 'voter'
g.server2 = g.cluster:build_and_add_server({
- alias = 'server_gh7253_2', box_cfg = box_cfg
+ alias = 'server2', box_cfg = box_cfg
})
g.server3 = g.cluster:build_and_add_server({
- alias = 'server_gh7253_3', box_cfg = box_cfg
+ alias = 'server3', box_cfg = box_cfg
})
g.cluster:start()
@@ -282,8 +282,8 @@ g.test_old_leader_txn_during_promote_write = function(g)
-- Build the topology:
-- server1 server2 <-> server3
--
- local server2_uri = server.build_listen_uri('server_gh7253_2')
- local server3_uri = server.build_listen_uri('server_gh7253_3')
+ local server2_uri = server.build_listen_uri('server2')
+ local server3_uri = server.build_listen_uri('server3')
server_set_replication(g.server1, {})
server_set_replication(g.server2, {server2_uri, server3_uri})
server_set_replication(g.server3, {server2_uri, server3_uri})
@@ -371,25 +371,25 @@ end
-- forwards the bad txn.
--
g.test_old_leader_txn_during_promote_write_complex = function(g)
- local server1_uri = server.build_listen_uri('server_gh7253_1')
- local server2_uri = server.build_listen_uri('server_gh7253_2')
- local server3_uri = server.build_listen_uri('server_gh7253_3')
- local server4_uri = server.build_listen_uri('server_gh7253_4')
- local server5_uri = server.build_listen_uri('server_gh7253_5')
+ local server1_uri = server.build_listen_uri('server1')
+ local server2_uri = server.build_listen_uri('server2')
+ local server3_uri = server.build_listen_uri('server3')
+ local server4_uri = server.build_listen_uri('server4')
+ local server5_uri = server.build_listen_uri('server5')
--
-- Build the topology:
-- server4 <- fullmesh(server1, server2, server3)
-- server3 <-> server5
--
g.server4 = g.cluster:build_and_add_server({
- alias = 'server_gh7253_4', box_cfg = g.server3.box_cfg
+ alias = 'server4', box_cfg = g.server3.box_cfg
})
g.server4:start()
-- Server5 is needed only to make server3 able to win elections without
-- participation of server1. Could also lower the quorum, but it wouldn't be
-- fair. The test is too complex for these tricks.
g.server5 = g.cluster:build_and_add_server({
- alias = 'server_gh7253_5', box_cfg = g.server3.box_cfg
+ alias = 'server5', box_cfg = g.server3.box_cfg
})
g.server5:start()
server_set_replication(g.server5, {server3_uri})
diff --git a/test/replication-luatest/gh_7377_bootstrap_connection_failure_test.lua b/test/replication-luatest/gh_7377_bootstrap_connection_failure_test.lua
index 2ee776b73b717316ad499ae77256d57fb724fe67..2680243ec41dd108bd4b126760ba7ff8a0d5d736 100644
--- a/test/replication-luatest/gh_7377_bootstrap_connection_failure_test.lua
+++ b/test/replication-luatest/gh_7377_bootstrap_connection_failure_test.lua
@@ -14,9 +14,9 @@ g.before_all(function(cg)
cg.servers = {}
local box_cfg = {
replication = {
- server.build_listen_uri('server_gh7377_1'),
- server.build_listen_uri('server_gh7377_2'),
- server.build_listen_uri('server_gh7377_3'),
+ server.build_listen_uri('server_1'),
+ server.build_listen_uri('server_2'),
+ server.build_listen_uri('server_3'),
},
replication_timeout = timeout,
bootstrap_strategy = 'legacy',
@@ -27,20 +27,19 @@ g.before_all(function(cg)
'cccccccc-cccc-cccc-cccc-cccccccccccc',
}
- -- Connection server_gh7377_3 -> server_gh7377_1 is proxied, others are not.
+ -- Connection server_3 -> server_1 is proxied, others are not.
cg.proxy = proxy:new{
- client_socket_path = server.build_listen_uri('server_gh7377_1_proxy'),
- server_socket_path = server.build_listen_uri('server_gh7377_1'),
+ client_socket_path = server.build_listen_uri('server_1_proxy'),
+ server_socket_path = server.build_listen_uri('server_1'),
}
t.assert(cg.proxy:start{force = true}, 'Proxy started successfully')
for i = 1, 3 do
box_cfg.instance_uuid = cg.uuids[i]
if i == 3 then
- box_cfg.replication[1] = server.build_listen_uri(
- 'server_gh7377_1_proxy')
+ box_cfg.replication[1] = server.build_listen_uri('server_1_proxy')
end
cg.servers[i] = cg.cluster:build_and_add_server({
- alias = 'server_gh7377_' .. i,
+ alias = 'server_' .. i,
box_cfg = box_cfg,
})
end
@@ -83,7 +82,7 @@ g.test_bootstrap_with_bad_connection = function(cg)
cg.cluster:start{wait_until_ready = false}
wait_bootstrapped(cg.servers[1], cg.uuids[2])
fiber.sleep(timeout)
- local logfile = fio.pathjoin(cg.servers[3].workdir, 'server_gh7377_3.log')
+ local logfile = fio.pathjoin(cg.servers[3].workdir, 'server_3.log')
t.assert(not cg.servers[3]:grep_log(bootstrap_msg, nil,
{filename = logfile}),
'Server 3 waits for connection')
diff --git a/test/replication-luatest/gh_7515_sync_node_sees_leader_hang_test.lua b/test/replication-luatest/gh_7515_sync_node_sees_leader_hang_test.lua
index 3dc9b9f245c0e83722db71ea9eafd420d41d6c4b..5665d3645b53b1acba5c889f7b4f5e7a0f3b1b51 100644
--- a/test/replication-luatest/gh_7515_sync_node_sees_leader_hang_test.lua
+++ b/test/replication-luatest/gh_7515_sync_node_sees_leader_hang_test.lua
@@ -11,19 +11,19 @@ g.before_each(function(cg)
local box_cfg = {
replication_timeout = 0.1,
replication = {
- server.build_listen_uri('server_gh7515_1'),
- server.build_listen_uri('server_gh7515_2'),
- server.build_listen_uri('server_gh7515_3'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
+ server.build_listen_uri('server3'),
},
}
for i = 1, 3 do
- local alias = 'server_gh7515_' .. i
+ local alias = 'server' .. i
if i == 1 then
box_cfg.election_mode = 'candidate'
else
box_cfg.election_mode = 'voter'
end
- cg['server' .. i] = cg.replica_set:build_and_add_server{
+ cg[alias] = cg.replica_set:build_and_add_server{
alias = alias,
box_cfg = box_cfg,
}
diff --git a/test/replication-luatest/gh_8168_extra_term_bump_test.lua b/test/replication-luatest/gh_8168_extra_term_bump_test.lua
index a998cf32d558bdc2a7411ef8121b581b9a13523e..daecea40cf939f45697ebc8781dce06456f99fdf 100644
--- a/test/replication-luatest/gh_8168_extra_term_bump_test.lua
+++ b/test/replication-luatest/gh_8168_extra_term_bump_test.lua
@@ -8,20 +8,20 @@ g.before_each(function(cg)
cg.replica_set = replica_set:new{}
local box_cfg = {
replication = {
- server.build_listen_uri('server_gh8168_1'),
- server.build_listen_uri('server_gh8168_2'),
+ server.build_listen_uri('server1'),
+ server.build_listen_uri('server2'),
},
election_mode = 'manual',
replication_timeout = 0.1,
}
cg.server1 = cg.replica_set:build_and_add_server{
- alias = 'server_gh8168_1',
+ alias = 'server1',
box_cfg = box_cfg,
}
box_cfg.election_timeout = 1e-9
box_cfg.read_only = true
cg.server2 = cg.replica_set:build_and_add_server{
- alias = 'server_gh8168_2',
+ alias = 'server2',
box_cfg = box_cfg,
}
cg.replica_set:start()
diff --git a/test/replication-luatest/linearizable_test.lua b/test/replication-luatest/linearizable_test.lua
index 5d03cc8b41f651b0ff57ace96f280d404daee8d4..c4e8d5e4e606b9c159ef150cc10d4838687ebc28 100644
--- a/test/replication-luatest/linearizable_test.lua
+++ b/test/replication-luatest/linearizable_test.lua
@@ -9,7 +9,7 @@ local g = t.group('linearizable-read')
local function build_replication(num_instances)
local t = {}
for i = 1, num_instances do
- table.insert(t, server.build_listen_uri('server_lr_' .. i .. '_proxy'))
+ table.insert(t, server.build_listen_uri('server_' .. i .. '_proxy'))
end
return t
end
@@ -26,25 +26,25 @@ g.before_all(function(cg)
memtx_use_mvcc_engine = true,
}
cg.servers[1] = cg.cluster:build_and_add_server({
- alias = 'server_lr_1',
+ alias = 'server_1',
box_cfg = cg.box_cfg,
})
-- Servers 2 and 3 are interconnected without a proxy.
for i = 2, num_servers do
- cg.box_cfg.replication[i] = server.build_listen_uri('server_lr_' .. i)
+ cg.box_cfg.replication[i] = server.build_listen_uri('server_' .. i)
end
for i = 2, num_servers do
cg.servers[i] = cg.cluster:build_and_add_server({
- alias = 'server_lr_' .. i,
+ alias = 'server_' .. i,
box_cfg = cg.box_cfg,
})
end
cg.proxies = {}
for i = 1, num_servers do
cg.proxies[i] = proxy:new({
- client_socket_path = server.build_listen_uri('server_lr_' .. i ..
+ client_socket_path = server.build_listen_uri('server_' .. i ..
'_proxy'),
- server_socket_path = server.build_listen_uri('server_lr_' .. i),
+ server_socket_path = server.build_listen_uri('server_' .. i),
})
cg.proxies[i]:start({force = true})
end