diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 2517de932a751cc17218dbe442168d49ceae3cd7..a2b158af3754870cee93e807fa5aa4e974883a32 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -237,12 +237,10 @@ class TarantoolServer(Server):
"name": "default"}
generate_ports = [
'primary_port',
- 'secondary_port',
'admin_port',
-# 'replication_port',
]
generated_props = [
-# 'replication_source'
+ 'replication_source'
]
#----------------------------------PROPERTIES----------------------------------#
@property
@@ -377,23 +375,6 @@ class TarantoolServer(Server):
self.sql.port = port
self.sql.reconnect()
- @property
- def _sql_ro(self):
- if not hasattr(self, 'sql_ro'): self.sql_ro = None
- return self.sql_ro
- @_sql_ro.setter
- def _sql_ro(self, port):
- try:
- port = int(port)
- except ValueError as e:
- raise ValueError("Bad port number: '%s'" % port)
- if not hasattr(self, 'sql_ro') or self.sql_ro is None:
- self.sql_ro = BoxConnection('localhost', port)
- return
- if self.sql_ro.port != port:
- self.sql_ro.port = port
- self.sql_ro.reconnect()
-
@property
def log_des(self):
if not hasattr(self, '_log_des'): self._log_des = open(self.logfile, 'a')
@@ -521,7 +502,6 @@ class TarantoolServer(Server):
self.copy_config(config)
self.port = self.conf['admin_port']
self._sql = self.conf['primary_port']
- self._sql_ro = self.conf['secondary_port']
self._admin = self.conf['admin_port']
def reconfigure(self, config, silent=False, override=['all']):
@@ -544,13 +524,13 @@ class TarantoolServer(Server):
self.conf['primary_port'] = self.hot_master.sql.port
if not self.rpl_master is None and 'replication_source' in self.generated_fields:
self.conf['replication_source'] = \
- '127.0.0.1:'+str(self.rpl_master.conf['replication_port'])
+ '127.0.0.1:'+str(self.rpl_master.conf['primary_port'])
basic = TarantoolConfig(self.cfgfile_source).parse()
addit = {}
for key in self.generated_fields:
- if key in basic and (override_all or key in override):
+ if key in basic and (override_all or key in override) and key in self.conf:
addit[key] = str(self.conf[key])
basic.update(addit)
TarantoolConfig(self.cfgfile).generate(basic)
diff --git a/test/replication/cfg/hot_standby.cfg b/test/replication/cfg/hot_standby.cfg
index d0d33d6ea01a71394a36934c7ce043aa8f5b013c..586a1f48c5f14770e136ca4f6f1cf6c868d65e50 100644
--- a/test/replication/cfg/hot_standby.cfg
+++ b/test/replication/cfg/hot_standby.cfg
@@ -11,4 +11,3 @@ snap_dir="../"
primary_port = 33013
admin_port = 33025
-replication_port=33017
diff --git a/test/replication/cfg/master.cfg b/test/replication/cfg/master.cfg
index 09f2a2c474315c38f2a3771bba6917126137b672..78bc98118cce5fee26213facbc2ce20b2ffdba4c 100644
--- a/test/replication/cfg/master.cfg
+++ b/test/replication/cfg/master.cfg
@@ -7,4 +7,3 @@ custom_proc_title="master"
primary_port = 33013
admin_port = 33015
-replication_port = 33017
diff --git a/test/replication/cfg/master_to_replica.cfg b/test/replication/cfg/master_to_replica.cfg
index ed9ecf5f324715e3497537284dc4676d9852bb6d..75591bc3a6af6d9fa94f63613711c1a4f2a64116 100644
--- a/test/replication/cfg/master_to_replica.cfg
+++ b/test/replication/cfg/master_to_replica.cfg
@@ -8,5 +8,4 @@ custom_proc_title="master"
primary_port = 33013
admin_port = 33015
-replication_port=33017
-replication_source = "127.0.0.1:33117"
+replication_source = "127.0.0.1:33113"
diff --git a/test/replication/cfg/replica.cfg b/test/replication/cfg/replica.cfg
index d742f80cadd99b217b59d284687f537c42a2bcfe..fb44921cbb6e2cb2e6bd87b1d4a72963ea17ec6d 100644
--- a/test/replication/cfg/replica.cfg
+++ b/test/replication/cfg/replica.cfg
@@ -8,5 +8,4 @@ custom_proc_title="replica"
primary_port = 33113
admin_port = 33115
-replication_port=33117
-replication_source = 127.0.0.1:33017
+replication_source = 127.0.0.1:33013
diff --git a/test/replication/cfg/replica_to_master.cfg b/test/replication/cfg/replica_to_master.cfg
index b56f4bad5d08f7188fdd3a097efce88d498d9a1b..5fb59c15565ba8bd0a5d9221a47a04e62d92baf3 100644
--- a/test/replication/cfg/replica_to_master.cfg
+++ b/test/replication/cfg/replica_to_master.cfg
@@ -7,4 +7,3 @@ custom_proc_title="replica"
primary_port = 33113
admin_port = 33115
-replication_port = 33117
diff --git a/test/replication/consistent.result b/test/replication/consistent.result
index bb23cf71f0495cd074de3bef8d1bde30cd9b6acf..d3befef6fa3ea9ceda094fe0f5681e1fa2e515f9 100644
--- a/test/replication/consistent.result
+++ b/test/replication/consistent.result
@@ -482,10 +482,12 @@ _print_lsn()
- 63
...
-- Test that a replica replies with master connection URL on update request
+--# push filter '127.0.0.1:.*' to '127.0.0.1:<port>'
box.space[0]:insert{0, 'replica is RO'}
---
-- error: 'Can''t modify data on a replication slave. My master is: 127.0.0.1:33017'
+- error: 'Can''t modify data on a replication slave. My master is: 127.0.0.1:<port>
...
+--# clear filter
--# stop server replica
--# cleanup server replica
--# set connection default
diff --git a/test/replication/consistent.test.lua b/test/replication/consistent.test.lua
index 0252adb2a32ad6039a0beb786e631c97529ba3ca..e8cf28cb698ba3cdcd17c205dd1ab58a8ecbd7fc 100644
--- a/test/replication/consistent.test.lua
+++ b/test/replication/consistent.test.lua
@@ -161,7 +161,9 @@ _print_lsn()
_print_lsn()
-- Test that a replica replies with master connection URL on update request
+--# push filter '127.0.0.1:.*' to '127.0.0.1:<port>'
box.space[0]:insert{0, 'replica is RO'}
+--# clear filter
--# stop server replica
--# cleanup server replica
--# set connection default
diff --git a/test/replication/hot_standby.result b/test/replication/hot_standby.result
index 49b0ffd232842608856b264325a3d2e04254f91d..e49c47c4187e030a2adda8687988627040e140a4 100644
--- a/test/replication/hot_standby.result
+++ b/test/replication/hot_standby.result
@@ -1,5 +1,5 @@
--# create server hot_standby with configuration='replication/cfg/hot_standby.cfg' with hot_master=default
---# create server replica with configuration='replication/cfg/replica.cfg'
+--# create server replica with configuration='replication/cfg/replica.cfg' with rpl_master=default
--# start server hot_standby
--# start server replica
--# setopt delimiter ';'
diff --git a/test/replication/hot_standby.test.lua b/test/replication/hot_standby.test.lua
index 9cdb50a83e04a3f1c308803cd1b8176d65faea70..c60722fd264084af765b3201621d09cb7e1f2dfb 100644
--- a/test/replication/hot_standby.test.lua
+++ b/test/replication/hot_standby.test.lua
@@ -1,5 +1,5 @@
--# create server hot_standby with configuration='replication/cfg/hot_standby.cfg' with hot_master=default
---# create server replica with configuration='replication/cfg/replica.cfg'
+--# create server replica with configuration='replication/cfg/replica.cfg' with rpl_master=default
--# start server hot_standby
--# start server replica
diff --git a/test/replication/init_storage.test.py b/test/replication/init_storage.test.py
index b98bdd0acd7238ff037601600dde161bf1d023ff..95d5a53bd425ee20c7b0dd6fdc4e193b82215063 100644
--- a/test/replication/init_storage.test.py
+++ b/test/replication/init_storage.test.py
@@ -3,7 +3,7 @@ import glob
from lib.tarantool_server import TarantoolServer
# master server
-cfgfile_bkp = server.cfgfile_source
+cfgfile_backup = server.cfgfile_source
master = server
master.admin("space = box.schema.create_space('test', {id = 42})")
@@ -52,6 +52,6 @@ replica.stop()
replica.cleanup(True)
server.stop()
-server.cfgfile_source = cfgfile_bkp
+server.cfgfile_source = cfgfile_backup
server.deploy()