From 8a191b54e38d9fb49cfc16a9668e54943ef2bdfe Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Wed, 16 Jul 2014 17:43:08 +0400
Subject: [PATCH] Fix #356: rename admin_port to admin, primary_port to listen
---
src/box/box.cc | 20 +++++++-------------
src/box/lua/load_cfg.lua | 8 ++++----
src/tarantool.cc | 21 ---------------------
test/app/float_value.result | 10 +++++-----
test/app/float_value.test.lua | 2 +-
test/app/init_script.result | 24 ++++++++++++------------
test/app/init_script.test.lua | 4 ++--
test/big/big.lua | 4 ++--
test/box/access.result | 2 +-
test/box/access.test.lua | 2 +-
test/box/admin.result | 12 ++++++------
test/box/admin.test.lua | 4 ++--
test/box/box.lua | 4 ++--
test/box/box.net.box.result | 2 +-
test/box/box.net.box.test.lua | 2 +-
test/box/bsdsocket.result | 6 +++---
test/box/bsdsocket.test.lua | 6 +++---
test/box/cfg.result | 20 ++++++++++----------
test/box/cfg.test.lua | 4 ++--
test/box/configuration.test.py | 4 ++--
test/box/protocol.result | 4 ++--
test/box/protocol.test.lua | 4 ++--
test/box/socket.result | 4 ++--
test/box/socket.test.py | 4 ++--
test/lib/preprocessor.py | 10 +++++-----
test/lib/tarantool_server.py | 6 +++---
test/module/box.lua | 4 ++--
test/replication/consistent.test.lua | 2 +-
test/replication/hot_standby.lua | 4 ++--
test/replication/hot_standby.result | 8 ++++----
test/replication/hot_standby.test.lua | 8 ++++----
test/replication/master.lua | 4 ++--
test/replication/replica.lua | 8 ++++----
test/replication/swap.test.py | 2 +-
test/wal/wal.lua | 4 ++--
35 files changed, 105 insertions(+), 132 deletions(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index eb851cd4e4..aed274fc98 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -135,12 +135,6 @@ box_check_config()
{
box_check_wal_mode(cfg_gets("wal_mode"));
- /* check primary port */
- int primary_port = cfg_geti("primary_port");
- if (primary_port < 0 || primary_port >= USHRT_MAX)
- tnt_raise(ClientError, ER_CFG,
- "invalid primary port value");
-
/* check rows_per_wal configuration */
if (cfg_geti("rows_per_wal") <= 1) {
tnt_raise(ClientError, ER_CFG,
@@ -415,18 +409,18 @@ box_init()
cfg_getd("wal_dir_rescan_delay"));
title("hot_standby", NULL);
- const char *primary_port = cfg_gets("primary_port");
- const char *admin_port = cfg_gets("admin_port");
+ const char *listen = cfg_gets("listen");
+ const char *admin = cfg_gets("admin");
/*
* application server configuration).
*/
- if (!primary_port && !admin_port)
+ if (!listen && !admin)
box_leave_local_standby_mode(NULL);
else {
void (*on_bind)(void *) = NULL;
- if (primary_port) {
- iproto_init(primary_port);
+ if (listen) {
+ iproto_init(listen);
} else {
/*
* If no prmary port is given, leave local
@@ -436,8 +430,8 @@ box_init()
*/
on_bind = box_leave_local_standby_mode;
}
- if (admin_port)
- admin_init(admin_port, on_bind);
+ if (admin)
+ admin_init(admin, on_bind);
}
if (cfg_getd("io_collect_interval") > 0) {
ev_set_io_collect_interval(loop(),
diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 02deb93aa9..d96ae62410 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -20,14 +20,14 @@ end
-- arguments that can be number or string
local wrapper_cfg = {
- admin_port = normalize_port_uri,
- primary_port = normalize_port_uri,
+ admin = normalize_port_uri,
+ listen = normalize_port_uri,
}
-- all available options
local default_cfg = {
- admin_port = nil,
- primary_port = nil,
+ admin = nil,
+ listen = nil,
slab_alloc_arena = 1.0,
slab_alloc_minimal = 64,
slab_alloc_factor = 2.0,
diff --git a/src/tarantool.cc b/src/tarantool.cc
index bc97009960..d9ca591089 100644
--- a/src/tarantool.cc
+++ b/src/tarantool.cc
@@ -109,27 +109,6 @@ title(const char *role, const char *fmt, ...)
bufptr += snprintf(bufptr, bufend - bufptr, "%s", s);
}
-#if 0
- /**
- * The below code is broken for two reasons:
- * - primary_port and admin_port are no longer integers,
- * but strings
- * - title is used in forks, and cfg_geti doesn't work
- * in a fork, since Lua interpreter state is not
- * fork-safe. And it is not fork-safe because it
- * refers to tuple objects, which are not fork-safe.
- */
- int ports[] = { cfg_geti("primary_port"), cfg_geti("admin_port") };
- int *pptr = ports;
- const char *names[] = { "pri", "adm", NULL };
- const char **nptr = names;
-
- for (; *nptr; nptr++, pptr++)
- if (*pptr)
- bufptr += snprintf(bufptr, bufend - bufptr,
- " %s: %i", *nptr, *pptr);
-#endif
-
set_proc_title(buf);
}
diff --git a/test/app/float_value.result b/test/app/float_value.result
index 8f1a02c5dc..e6c4ad1368 100644
--- a/test/app/float_value.result
+++ b/test/app/float_value.result
@@ -2,7 +2,7 @@ box.cfg
1 pid_file:box.pid
2 slab_alloc_factor:2
3 rows_per_wal:50
-4 admin_port:3313
+4 background:false
5 logger:tarantool.log
6 slab_alloc_arena:0.1
7 wal_dir:.
@@ -13,10 +13,10 @@ box.cfg
12 panic_on_snap_error:true
13 panic_on_wal_error:false
14 log_level:5
-15 readahead:16320
-16 too_long_threshold:0.01
-17 slab_alloc_minimal:64
-18 background:false
+15 admin:3313
+16 readahead:16320
+17 too_long_threshold:0.01
+18 slab_alloc_minimal:64
19 wal_dir_rescan_delay:0.1
------------------------------------------------------
Check that too_long_threshold = 0.01
diff --git a/test/app/float_value.test.lua b/test/app/float_value.test.lua
index ef17df5b37..bd39a55f03 100755
--- a/test/app/float_value.test.lua
+++ b/test/app/float_value.test.lua
@@ -3,7 +3,7 @@
-- Test floating points values (too_long_treshold) with fractional part
--
box.cfg{
- admin_port = 3313,
+ admin = 3313,
slab_alloc_arena = 0.1,
pid_file = "box.pid",
rows_per_wal = 50,
diff --git a/test/app/init_script.result b/test/app/init_script.result
index e3644e2e17..beb3341132 100644
--- a/test/app/init_script.result
+++ b/test/app/init_script.result
@@ -6,22 +6,22 @@ box.cfg
1 too_long_threshold:0.5
2 slab_alloc_factor:2
3 slab_alloc_minimal:64
-4 admin_port:3313
+4 background:false
5 logger:tarantool.log
-6 primary_port:3314
+6 slab_alloc_arena:1
7 wal_dir:.
-8 logger_nonblock:true
-9 snap_dir:.
-10 coredump:false
-11 wal_mode:write
-12 log_level:5
+8 listen:3314
+9 logger_nonblock:true
+10 snap_dir:.
+11 coredump:false
+12 wal_mode:write
13 panic_on_snap_error:true
14 panic_on_wal_error:false
-15 rows_per_wal:500000
-16 readahead:16320
-17 pid_file:box.pid
-18 background:false
-19 slab_alloc_arena:1
+15 pid_file:box.pid
+16 admin:3313
+17 rows_per_wal:500000
+18 readahead:16320
+19 log_level:5
20 wal_dir_rescan_delay:0.1
--
-- Test insert from detached fiber
diff --git a/test/app/init_script.test.lua b/test/app/init_script.test.lua
index cd64a605f9..41b523858a 100755
--- a/test/app/init_script.test.lua
+++ b/test/app/init_script.test.lua
@@ -3,8 +3,8 @@
-- Testing init script
--
box.cfg{
- admin_port = 3313,
- primary_port = 3314,
+ admin = 3313,
+ listen = 3314,
pid_file = "box.pid",
logger="tarantool.log"
}
diff --git a/test/big/big.lua b/test/big/big.lua
index 2cb5be4183..62cdeea836 100644
--- a/test/big/big.lua
+++ b/test/big/big.lua
@@ -1,8 +1,8 @@
#!/usr/bin/env tarantool
box.cfg{
- primary_port = os.getenv("PRIMARY_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
+ listen = os.getenv("LISTEN"),
+ admin = os.getenv("ADMIN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
rows_per_wal = 50
diff --git a/test/box/access.result b/test/box/access.result
index 0f4d761497..207457a2fa 100644
--- a/test/box/access.result
+++ b/test/box/access.result
@@ -156,7 +156,7 @@ box.schema.user.drop('ПетÑ_Иванов')
---
...
-- gh-300: misleading error message if a function does not exist
-c = (require 'net.box'):new("127.0.0.1", box.cfg.primary_port)
+c = (require 'net.box'):new("127.0.0.1", box.cfg.listen)
---
...
c:call('nosuchfunction')
diff --git a/test/box/access.test.lua b/test/box/access.test.lua
index 7a1f5119b4..3b41ced8c1 100644
--- a/test/box/access.test.lua
+++ b/test/box/access.test.lua
@@ -74,7 +74,7 @@ box.schema.user.create('ПетÑ_Иванов')
box.schema.user.drop('ПетÑ_Иванов')
-- gh-300: misleading error message if a function does not exist
-c = (require 'net.box'):new("127.0.0.1", box.cfg.primary_port)
+c = (require 'net.box'):new("127.0.0.1", box.cfg.listen)
c:call('nosuchfunction')
function nosuchfunction() end
diff --git a/test/box/admin.result b/test/box/admin.result
index 498e699f82..c59aa40468 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -6,8 +6,8 @@ space = box.schema.create_space('tweedledum', { id = 0 })
space:create_index('primary', { type = 'hash' })
---
...
---# push filter 'primary_port: .*' to 'primary_port: <number>'
---# push filter 'admin_port: .*' to 'admin_port: <number>'
+--# push filter 'listen: .*' to 'listen: <uri>'
+--# push filter 'admin: .*' to 'admin: <uri>'
help()
---
- - Help topics:
@@ -22,21 +22,21 @@ box.cfg
- too_long_threshold: 0.5
slab_alloc_factor: 2
rows_per_wal: 50
- admin_port: <number>
+ background: false
slab_alloc_arena: 0.1
wal_dir: .
+ listen: <uri>
logger_nonblock: true
snap_dir: .
coredump: false
wal_mode: write
- log_level: 5
panic_on_snap_error: true
panic_on_wal_error: false
+ log_level: 5
+ admin: <uri>
readahead: 16320
- primary_port: <number>
pid_file: tarantool.pid
slab_alloc_minimal: 64
- background: false
wal_dir_rescan_delay: 0.1
...
space:insert{1, 'tuple'}
diff --git a/test/box/admin.test.lua b/test/box/admin.test.lua
index 833819b918..506d46006c 100644
--- a/test/box/admin.test.lua
+++ b/test/box/admin.test.lua
@@ -4,8 +4,8 @@
space = box.schema.create_space('tweedledum', { id = 0 })
space:create_index('primary', { type = 'hash' })
---# push filter 'primary_port: .*' to 'primary_port: <number>'
---# push filter 'admin_port: .*' to 'admin_port: <number>'
+--# push filter 'listen: .*' to 'listen: <uri>'
+--# push filter 'admin: .*' to 'admin: <uri>'
help()
box.cfg
space:insert{1, 'tuple'}
diff --git a/test/box/box.lua b/test/box/box.lua
index 911fe7022f..2fefb66c21 100644
--- a/test/box/box.lua
+++ b/test/box/box.lua
@@ -2,8 +2,8 @@
os = require('os')
box.cfg{
- primary_port = os.getenv("PRIMARY_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
+ listen = os.getenv("LISTEN"),
+ admin = os.getenv("ADMIN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
rows_per_wal = 50
diff --git a/test/box/box.net.box.result b/test/box/box.net.box.result
index f112b865d8..d410e5032e 100644
--- a/test/box/box.net.box.result
+++ b/test/box/box.net.box.result
@@ -10,7 +10,7 @@ log = require 'log'
box.schema.user.grant('guest', 'read,write,execute', 'universe')
---
...
-port = box.cfg.primary_port
+port = box.cfg.listen
---
...
space = box.schema.create_space('net_box_test_space')
diff --git a/test/box/box.net.box.test.lua b/test/box/box.net.box.test.lua
index 953e964a5f..68e9356a6d 100644
--- a/test/box/box.net.box.test.lua
+++ b/test/box/box.net.box.test.lua
@@ -3,7 +3,7 @@ fiber = require 'fiber'
log = require 'log'
box.schema.user.grant('guest', 'read,write,execute', 'universe')
-port = box.cfg.primary_port
+port = box.cfg.listen
space = box.schema.create_space('net_box_test_space')
space:create_index('primary', { type = 'tree' })
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index 5a93269d22..4c9fb2fdf4 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -43,14 +43,14 @@ type(s:error())
---
- nil
...
-primary_port = string.gsub(box.cfg.primary_port, '^.*:', '')
+port = string.gsub(box.cfg.listen, '^.*:', '')
---
...
s:nonblock(false)
---
- false
...
-s:sysconnect('127.0.0.1', primary_port)
+s:sysconnect('127.0.0.1', port)
---
- true
...
@@ -807,7 +807,7 @@ socket.tcp_connect('127.0.0.1', 80, 0.00000000001)
- null
...
-- close
-s = socket.tcp_connect('127.0.0.1', primary_port)
+s = socket.tcp_connect('127.0.0.1', port)
---
...
string.sub(s:read(128), 1, 9)
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index ba0155af47..43a87179bb 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -14,10 +14,10 @@ type(s)
s:errno()
type(s:error())
-primary_port = string.gsub(box.cfg.primary_port, '^.*:', '')
+port = string.gsub(box.cfg.listen, '^.*:', '')
s:nonblock(false)
-s:sysconnect('127.0.0.1', primary_port)
+s:sysconnect('127.0.0.1', port)
s:nonblock(true)
s:nonblock()
s:nonblock(false)
@@ -258,7 +258,7 @@ socket.tcp_connect('127.0.0.1', 80, 0.00000000001)
-- close
-s = socket.tcp_connect('127.0.0.1', primary_port)
+s = socket.tcp_connect('127.0.0.1', port)
string.sub(s:read(128), 1, 9)
sa = { fh = 512 } setmetatable(sa, getmetatable(s))
tostring(sa)
diff --git a/test/box/cfg.result b/test/box/cfg.result
index 2d9d9ba67c..04c0a7f051 100644
--- a/test/box/cfg.result
+++ b/test/box/cfg.result
@@ -1,5 +1,5 @@
---# push filter 'primary_port: .*' to 'primary_port: <number>'
---# push filter 'admin_port: .*' to 'admin_port: <number>'
+--# push filter 'listen: .*' to 'primary: <uri>'
+--# push filter 'admin: .*' to 'admin: <uri>'
box.cfg.nosuchoption = 1
---
- error: '[string "-- load_cfg.lua - internal file..."]:127: Attempt to modify a read-only
@@ -13,21 +13,21 @@ t
- - 'too_long_threshold: 0.5'
- 'slab_alloc_factor: 2'
- 'rows_per_wal: 50'
- - 'admin_port: <number>
+ - 'background: false'
- 'slab_alloc_arena: 0.1'
- 'wal_dir: .'
+ - 'primary: <uri>
- 'logger_nonblock: true'
- 'snap_dir: .'
- 'coredump: false'
- 'wal_mode: write'
- - 'log_level: 5'
- 'panic_on_snap_error: true'
- 'panic_on_wal_error: false'
+ - 'log_level: 5'
+ - 'admin: <uri>
- 'readahead: 16320'
- - 'primary_port: <number>
- 'pid_file: tarantool.pid'
- 'slab_alloc_minimal: 64'
- - 'background: false'
- 'wal_dir_rescan_delay: 0.1'
...
-- must be read-only
@@ -42,21 +42,21 @@ t
- - 'too_long_threshold: 0.5'
- 'slab_alloc_factor: 2'
- 'rows_per_wal: 50'
- - 'admin_port: <number>
+ - 'background: false'
- 'slab_alloc_arena: 0.1'
- 'wal_dir: .'
+ - 'primary: <uri>
- 'logger_nonblock: true'
- 'snap_dir: .'
- 'coredump: false'
- 'wal_mode: write'
- - 'log_level: 5'
- 'panic_on_snap_error: true'
- 'panic_on_wal_error: false'
+ - 'log_level: 5'
+ - 'admin: <uri>
- 'readahead: 16320'
- - 'primary_port: <number>
- 'pid_file: tarantool.pid'
- 'slab_alloc_minimal: 64'
- - 'background: false'
- 'wal_dir_rescan_delay: 0.1'
...
--# clear filter
diff --git a/test/box/cfg.test.lua b/test/box/cfg.test.lua
index ccacd0ee62..ee99deae79 100644
--- a/test/box/cfg.test.lua
+++ b/test/box/cfg.test.lua
@@ -1,5 +1,5 @@
---# push filter 'primary_port: .*' to 'primary_port: <number>'
---# push filter 'admin_port: .*' to 'admin_port: <number>'
+--# push filter 'listen: .*' to 'primary: <uri>'
+--# push filter 'admin: .*' to 'admin: <uri>'
box.cfg.nosuchoption = 1
t = {} for k,v in pairs(box.cfg) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
t
diff --git a/test/box/configuration.test.py b/test/box/configuration.test.py
index 3489b2ba77..d311508eb1 100644
--- a/test/box/configuration.test.py
+++ b/test/box/configuration.test.py
@@ -24,8 +24,8 @@ server.cfgfile_source = old_cfgfile
old_script = server.script
server.script = "box/lua/test_init.lua"
server.deploy()
-sys.stdout.push_filter("admin_port: .*", "admin_port: <number>")
-sys.stdout.push_filter("primary_port: .*", "primary_port: <number>")
+sys.stdout.push_filter("admin: .*", "admin: <uri>")
+sys.stdout.push_filter("listen: .*", "listen: <uri>")
admin("print_config()")
sys.stdout.pop_filter()
sys.stdout.pop_filter()
diff --git a/test/box/protocol.result b/test/box/protocol.result
index 829f15f042..fbbe9a349d 100644
--- a/test/box/protocol.result
+++ b/test/box/protocol.result
@@ -13,10 +13,10 @@ space:create_index('primary', { type = 'tree'})
for i=1,5 do space:insert{i} end
---
...
-primary_port = string.gsub(box.cfg.primary_port, '^.*:', '')
+port = string.gsub(box.cfg.listen, '^.*:', '')
---
...
-conn = (require 'net.box'):new('127.0.0.1', tonumber(primary_port))
+conn = (require 'net.box'):new('127.0.0.1', tonumber(port))
---
...
conn.space[space.id]:select(3, { iterator = 'GE' })
diff --git a/test/box/protocol.test.lua b/test/box/protocol.test.lua
index cf12475210..975fb20ffa 100644
--- a/test/box/protocol.test.lua
+++ b/test/box/protocol.test.lua
@@ -8,8 +8,8 @@ space = box.schema.create_space('tweedledum')
space:create_index('primary', { type = 'tree'})
for i=1,5 do space:insert{i} end
-primary_port = string.gsub(box.cfg.primary_port, '^.*:', '')
-conn = (require 'net.box'):new('127.0.0.1', tonumber(primary_port))
+port = string.gsub(box.cfg.listen, '^.*:', '')
+conn = (require 'net.box'):new('127.0.0.1', tonumber(port))
conn.space[space.id]:select(3, { iterator = 'GE' })
conn.space[space.id]:select(3, { iterator = 'LE' })
conn.space[space.id]:select(3, { iterator = 'GT' })
diff --git a/test/box/socket.result b/test/box/socket.result
index 38dc37efa0..56b3945ee1 100644
--- a/test/box/socket.result
+++ b/test/box/socket.result
@@ -902,7 +902,7 @@ ping
s:close()
---
...
- replies = 0 packet = require('msgpack').encode({[0] = 64, [1] = 0}) packet = require('msgpack').encode(packet:len())..packet function bug1160869() local s = socket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', '')) s:recv(128) require('fiber').wrap(function() while true do _, status = s:recv(18) if status == "eof" then error("unexpected eof") end replies = replies + 1 end end) return s:send(packet) end
+ replies = 0 packet = require('msgpack').encode({[0] = 64, [1] = 0}) packet = require('msgpack').encode(packet:len())..packet function bug1160869() local s = socket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.listen, '^.*:', '')) s:recv(128) require('fiber').wrap(function() while true do _, status = s:recv(18) if status == "eof" then error("unexpected eof") end replies = replies + 1 end end) return s:send(packet) end
---
...
bug1160869()
@@ -924,7 +924,7 @@ replies
---
- 3
...
- s = nil syncno = 0 reps = 0 packet = require('msgpack').encode({[0] = 64, [1] = 0}) packet = require('msgpack').encode(packet:len())..packet function iostart() if s ~= nil then return end s = socket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', '')) s:recv(128) require('fiber').wrap(function() while true do s:recv(18) if status == "eof" then error("unexpected eof") end reps = reps + 1 end end) end function iotest() iostart() syncno = syncno + 1 packet = require('msgpack').encode({[0] = 64, [1] = syncno}) packet = require('msgpack').encode(packet:len())..packet return s:send(packet) end
+ s = nil syncno = 0 reps = 0 packet = require('msgpack').encode({[0] = 64, [1] = 0}) packet = require('msgpack').encode(packet:len())..packet function iostart() if s ~= nil then return end s = socket.tcp() s:connect('127.0.0.1', string.gsub(box.cfg.listen, '^.*:', '')) s:recv(128) require('fiber').wrap(function() while true do s:recv(18) if status == "eof" then error("unexpected eof") end reps = reps + 1 end end) end function iotest() iostart() syncno = syncno + 1 packet = require('msgpack').encode({[0] = 64, [1] = syncno}) packet = require('msgpack').encode(packet:len())..packet return s:send(packet) end
---
...
iotest()
diff --git a/test/box/socket.test.py b/test/box/socket.test.py
index 09605f6221..f9b2b4b043 100644
--- a/test/box/socket.test.py
+++ b/test/box/socket.test.py
@@ -516,7 +516,7 @@ packet = require('msgpack').encode({[0] = 64, [1] = 0})
packet = require('msgpack').encode(packet:len())..packet
function bug1160869()
local s = socket.tcp()
- s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', ''))
+ s:connect('127.0.0.1', string.gsub(box.cfg.listen, '^.*:', ''))
s:recv(128)
require('fiber').wrap(function()
while true do
@@ -549,7 +549,7 @@ function iostart()
return
end
s = socket.tcp()
- s:connect('127.0.0.1', string.gsub(box.cfg.primary_port, '^.*:', ''))
+ s:connect('127.0.0.1', string.gsub(box.cfg.listen, '^.*:', ''))
s:recv(128)
require('fiber').wrap(function()
while true do
diff --git a/test/lib/preprocessor.py b/test/lib/preprocessor.py
index bf565ab31d..ca979a41b9 100644
--- a/test/lib/preprocessor.py
+++ b/test/lib/preprocessor.py
@@ -30,8 +30,8 @@ class TestState(object):
# curcon is an array since we may have many connections
self.curcon = [self.connections['default']]
nmsp = Namespace()
- setattr(nmsp, 'admin_port', default_server.admin.port)
- setattr(nmsp, 'primary_port', default_server.sql.port)
+ setattr(nmsp, 'admin', default_server.admin.port)
+ setattr(nmsp, 'listen', default_server.sql.port)
setattr(self.environ, 'default', nmsp)
def parse_preprocessor(self, string):
@@ -143,10 +143,10 @@ class TestState(object):
self.servers[sname] = temp
self.servers[sname].deploy(silent=True)
nmsp = Namespace()
- setattr(nmsp, 'admin_port', temp.admin.port)
- setattr(nmsp, 'primary_port', temp.sql.port)
+ setattr(nmsp, 'admin', temp.admin.port)
+ setattr(nmsp, 'listen', temp.sql.port)
if temp.rpl_master:
- setattr(nmsp, 'master_port', temp.rpl_master.sql.port)
+ setattr(nmsp, 'master', temp.rpl_master.sql.port)
setattr(self.environ, sname, nmsp)
elif ctype == 'start':
if sname not in self.servers:
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 8c27d43091..b47d48dffa 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -464,10 +464,10 @@ class TarantoolServer(Server):
check_port(self.admin.port)
- os.putenv("PRIMARY_PORT", str(self.sql.port))
- os.putenv("ADMIN_PORT", str(self.admin.port))
+ os.putenv("LISTEN", str(self.sql.port))
+ os.putenv("ADMIN", str(self.admin.port))
if self.rpl_master:
- os.putenv("MASTER_PORT", "127.0.0.1:"+str(self.rpl_master.sql.port))
+ os.putenv("MASTER", "127.0.0.1:"+str(self.rpl_master.sql.port))
args = self.prepare_args()
self.logfile_pos = self.logfile
self.process = subprocess.Popen(args,
diff --git a/test/module/box.lua b/test/module/box.lua
index cf37118070..08d6b6e3d9 100644
--- a/test/module/box.lua
+++ b/test/module/box.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env tarantool
box.cfg{
- primary_port = os.getenv("PRIMARY_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
+ listen = os.getenv("LISTEN"),
+ admin = os.getenv("ADMIN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
rows_per_wal = 50
diff --git a/test/replication/consistent.test.lua b/test/replication/consistent.test.lua
index 9cd4d4efbc..a756258b89 100644
--- a/test/replication/consistent.test.lua
+++ b/test/replication/consistent.test.lua
@@ -35,7 +35,7 @@ do
end;
--# setopt delimiter ''
--# set connection default
---# set variable replica_port to 'replica.primary_port'
+--# set variable replica_port to 'replica.listen'
-- set begin lsn on master and replica.
begin_lsn = box.info.lsn
diff --git a/test/replication/hot_standby.lua b/test/replication/hot_standby.lua
index 279e0f8b8b..ffc2071338 100644
--- a/test/replication/hot_standby.lua
+++ b/test/replication/hot_standby.lua
@@ -1,8 +1,8 @@
#!/usr/bin/env tarantool
os = require('os')
box.cfg({
- primary_port = os.getenv("MASTER_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
+ listen = os.getenv("MASTER"),
+ admin = os.getenv("ADMIN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
logger = "tarantool.log",
diff --git a/test/replication/hot_standby.result b/test/replication/hot_standby.result
index fa9fe59847..24ed629b95 100644
--- a/test/replication/hot_standby.result
+++ b/test/replication/hot_standby.result
@@ -57,7 +57,7 @@ end;
--# setopt delimiter ''
--# set connection default
-- set begin lsn on master, replica and hot_standby.
---# set variable replica_port to 'replica.primary_port'
+--# set variable replica_port to 'replica.listen'
a = (require 'net.box'):new('127.0.0.1', replica_port)
---
...
@@ -121,9 +121,9 @@ _select(1, 10)
require('fiber').sleep(0.2)
---
...
--- hot_standby.primary_port is garbage, since hot_standby.lua
--- uses MASTER_PORT environment variable for its primary_port
---# set variable hot_standby_port to 'hot_standby.master_port'
+-- hot_standby.listen is garbage, since hot_standby.lua
+-- uses MASTER environment variable for its listen
+--# set variable hot_standby_port to 'hot_standby.master'
a = (require 'net.box'):new('127.0.0.1', hot_standby_port)
---
...
diff --git a/test/replication/hot_standby.test.lua b/test/replication/hot_standby.test.lua
index 8847b10eeb..997dbd1395 100644
--- a/test/replication/hot_standby.test.lua
+++ b/test/replication/hot_standby.test.lua
@@ -53,7 +53,7 @@ end;
--# set connection default
-- set begin lsn on master, replica and hot_standby.
---# set variable replica_port to 'replica.primary_port'
+--# set variable replica_port to 'replica.listen'
a = (require 'net.box'):new('127.0.0.1', replica_port)
a:call('_set_pri_lsn', box.info.node.id, box.info.node.lsn)
a:close()
@@ -71,9 +71,9 @@ _select(1, 10)
--# stop server default
require('fiber').sleep(0.2)
--- hot_standby.primary_port is garbage, since hot_standby.lua
--- uses MASTER_PORT environment variable for its primary_port
---# set variable hot_standby_port to 'hot_standby.master_port'
+-- hot_standby.listen is garbage, since hot_standby.lua
+-- uses MASTER environment variable for its listen
+--# set variable hot_standby_port to 'hot_standby.master'
a = (require 'net.box'):new('127.0.0.1', hot_standby_port)
a:call('_set_pri_lsn', box.info.node.id, box.info.node.lsn)
a:close()
diff --git a/test/replication/master.lua b/test/replication/master.lua
index 027352b109..3031d326f7 100644
--- a/test/replication/master.lua
+++ b/test/replication/master.lua
@@ -1,8 +1,8 @@
#!/usr/bin/env tarantool
os = require('os')
box.cfg({
- primary_port = os.getenv("PRIMARY_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
+ listen = os.getenv("LISTEN"),
+ admin = os.getenv("ADMIN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
logger = "| cat - >> tarantool.log",
diff --git a/test/replication/replica.lua b/test/replication/replica.lua
index 1be8b25dde..1ba51679c8 100644
--- a/test/replication/replica.lua
+++ b/test/replication/replica.lua
@@ -1,12 +1,12 @@
#!/usr/bin/env tarantool
-print('MASTER_PORT: ',os.getenv("MASTER_PORT"))
+print('MASTER: ',os.getenv("MASTER"))
print('MASTER_URI: ',os.getenv("MASTER_URI"))
box.cfg({
- primary_port = os.getenv("PRIMARY_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
- replication_source = os.getenv("MASTER_PORT"),
+ listen = os.getenv("LISTEN"),
+ admin = os.getenv("ADMIN"),
+ replication_source = os.getenv("MASTER"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
logger = "tarantool.log",
diff --git a/test/replication/swap.test.py b/test/replication/swap.test.py
index 8709ab8e65..451bf93a2c 100644
--- a/test/replication/swap.test.py
+++ b/test/replication/swap.test.py
@@ -25,7 +25,7 @@ master.admin("box.schema.user.create('%s', { password = '%s'})" % (LOGIN, PASSWO
master.admin("box.schema.user.grant('%s', 'read,write,execute', 'universe')" % LOGIN)
master.sql.py_con.authenticate(LOGIN, PASSWORD)
master.uri = '%s:%s@%s:%s' % (LOGIN, PASSWORD, HOST, master.sql.port)
-os.putenv('MASTER_PORT', master.uri)
+os.putenv('MASTER', master.uri)
# replica server
replica = TarantoolServer()
diff --git a/test/wal/wal.lua b/test/wal/wal.lua
index 78ba7b29ff..9ef4a7971e 100644
--- a/test/wal/wal.lua
+++ b/test/wal/wal.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env tarantool
box.cfg{
- primary_port = os.getenv("PRIMARY_PORT"),
- admin_port = os.getenv("ADMIN_PORT"),
+ listen = os.getenv("LISTEN"),
+ admin = os.getenv("ADMIN"),
slab_alloc_arena = 0.1,
pid_file = "tarantool.pid",
wal_mode = "none"
--
GitLab