diff --git a/test/replication/autobootstrap.lua b/test/replication/autobootstrap.lua index 856b36e66bb9..6d01fb2da74e 100644 --- a/test/replication/autobootstrap.lua +++ b/test/replication/autobootstrap.lua @@ -6,7 +6,6 @@ local USER = 'cluster' local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -25,7 +24,6 @@ box.cfg({ USER..':'..PASSWORD..'@'..instance_uri(3); }; replication_timeout = TIMEOUT; - replication_connect_timeout = CON_TIMEOUT; }) box.once("bootstrap", function() diff --git a/test/replication/autobootstrap.result b/test/replication/autobootstrap.result index 743982d47e7a..ec9667663e48 100644 --- a/test/replication/autobootstrap.result +++ b/test/replication/autobootstrap.result @@ -188,7 +188,7 @@ box.space.test_u:select() _ = test_run:cmd("switch autobootstrap1") --- ... -_ = test_run:cmd("restart server autobootstrap1 with cleanup=1, args ='0.1 0.5'") +_ = test_run:cmd("restart server autobootstrap1 with cleanup=1, args ='0.1'") _ = box.space.test_u:replace({5, 6, 7, 8}) --- ... diff --git a/test/replication/autobootstrap.test.lua b/test/replication/autobootstrap.test.lua index 055ea4277318..8c75d1322641 100644 --- a/test/replication/autobootstrap.test.lua +++ b/test/replication/autobootstrap.test.lua @@ -86,7 +86,7 @@ box.space.test_u:select() -- Rebootstrap one node and check that others follow. -- _ = test_run:cmd("switch autobootstrap1") -_ = test_run:cmd("restart server autobootstrap1 with cleanup=1, args ='0.1 0.5'") +_ = test_run:cmd("restart server autobootstrap1 with cleanup=1, args ='0.1'") _ = box.space.test_u:replace({5, 6, 7, 8}) box.space.test_u:select() diff --git a/test/replication/autobootstrap_guest.lua b/test/replication/autobootstrap_guest.lua index d7176ae5b342..54febd1b6da0 100644 --- a/test/replication/autobootstrap_guest.lua +++ b/test/replication/autobootstrap_guest.lua @@ -6,7 +6,6 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -25,7 +24,6 @@ box.cfg({ instance_uri(3); }; replication_timeout = TIMEOUT; - replication_connect_timeout = CON_TIMEOUT; }) box.once("bootstrap", function() diff --git a/test/replication/before_replace.result b/test/replication/before_replace.result index ced40547e6e9..ce66718d18f0 100644 --- a/test/replication/before_replace.result +++ b/test/replication/before_replace.result @@ -138,7 +138,7 @@ box.space.test:select() - [9, 90] - [10, 100] ... -test_run:cmd('restart server autobootstrap1 with args="0.1 0.5"') +test_run:cmd('restart server autobootstrap1 with args="0.1"') box.space.test:select() --- - - [1, 10] @@ -169,7 +169,7 @@ box.space.test:select() - [9, 90] - [10, 100] ... -test_run:cmd('restart server autobootstrap2 with args="0.1 0.5"') +test_run:cmd('restart server autobootstrap2 with args="0.1"') box.space.test:select() --- - - [1, 10] @@ -204,7 +204,7 @@ push_err --- - Session 'applier' does not support push() ... -test_run:cmd('restart server autobootstrap3 with args="0.1 0.5"') +test_run:cmd('restart server autobootstrap3 with args="0.1"') box.space.test:select() --- - - [1, 10] diff --git a/test/replication/before_replace.test.lua b/test/replication/before_replace.test.lua index bcc6dc00d949..3b9910cbc0be 100644 --- a/test/replication/before_replace.test.lua +++ b/test/replication/before_replace.test.lua @@ -65,16 +65,16 @@ vclock2 = test_run:wait_cluster_vclock(SERVERS, vclock) -- and the state persists after restart. test_run:cmd("switch autobootstrap1") box.space.test:select() -test_run:cmd('restart server autobootstrap1 with args="0.1 0.5"') +test_run:cmd('restart server autobootstrap1 with args="0.1"') box.space.test:select() test_run:cmd("switch autobootstrap2") box.space.test:select() -test_run:cmd('restart server autobootstrap2 with args="0.1 0.5"') +test_run:cmd('restart server autobootstrap2 with args="0.1"') box.space.test:select() test_run:cmd("switch autobootstrap3") box.space.test:select() push_err -test_run:cmd('restart server autobootstrap3 with args="0.1 0.5"') +test_run:cmd('restart server autobootstrap3 with args="0.1"') box.space.test:select() -- Cleanup. diff --git a/test/replication/ddl.lua b/test/replication/ddl.lua index 72cf1db69c28..2db977d46e97 100644 --- a/test/replication/ddl.lua +++ b/test/replication/ddl.lua @@ -7,7 +7,6 @@ local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -27,7 +26,6 @@ box.cfg({ USER..':'..PASSWORD..'@'..instance_uri(4); }; replication_timeout = TIMEOUT, - replication_connect_timeout = CON_TIMEOUT, }) box.once("bootstrap", function() diff --git a/test/replication/hot_standby.lua b/test/replication/hot_standby.lua index cd53fc7761e2..30742ce4f15c 100644 --- a/test/replication/hot_standby.lua +++ b/test/replication/hot_standby.lua @@ -10,6 +10,5 @@ box.cfg({ vinyl_dir = "master", hot_standby = true, replication_timeout = 0.1, - replication_connect_timeout = 0.5, }) diff --git a/test/replication/master.lua b/test/replication/master.lua index 9b96b7891233..e924b5495494 100644 --- a/test/replication/master.lua +++ b/test/replication/master.lua @@ -3,7 +3,6 @@ os = require('os') box.cfg({ listen = os.getenv("LISTEN"), memtx_memory = 107374182, - replication_connect_timeout = 0.5, replication_timeout = 0.1 }) diff --git a/test/replication/master_quorum.lua b/test/replication/master_quorum.lua index 05272ac5e11e..20f161cc0f9f 100644 --- a/test/replication/master_quorum.lua +++ b/test/replication/master_quorum.lua @@ -6,7 +6,6 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -25,7 +24,6 @@ box.cfg({ }; replication_connect_quorum = 0; replication_timeout = TIMEOUT; - replication_connect_timeout = CON_TIMEOUT; }) test_run = require('test_run').new() diff --git a/test/replication/on_replace.lua b/test/replication/on_replace.lua index 40c12a9ea31b..71e63d3f9367 100644 --- a/test/replication/on_replace.lua +++ b/test/replication/on_replace.lua @@ -7,7 +7,6 @@ local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -28,7 +27,6 @@ box.cfg({ USER..':'..PASSWORD..'@'..instance_uri(2); }; replication_timeout = TIMEOUT, - replication_connect_timeout = CON_TIMEOUT, }) box.once("bootstrap", function() diff --git a/test/replication/quorum.lua b/test/replication/quorum.lua index f61c8748fc95..129e676e0cee 100644 --- a/test/replication/quorum.lua +++ b/test/replication/quorum.lua @@ -6,7 +6,6 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -20,7 +19,6 @@ box.cfg({ listen = instance_uri(INSTANCE_ID); replication_timeout = TIMEOUT; replication_sync_lag = 0.01; - replication_connect_timeout = CON_TIMEOUT; replication_connect_quorum = 3; replication = { instance_uri(1); diff --git a/test/replication/quorum.result b/test/replication/quorum.result index 07abe7f2abdd..8ea9fa22e3bc 100644 --- a/test/replication/quorum.result +++ b/test/replication/quorum.result @@ -27,7 +27,7 @@ test_run:cmd('switch quorum2') --- - true ... -test_run:cmd('restart server quorum2 with args="0.1 0.5"') +test_run:cmd('restart server quorum2 with args="0.1"') box.info.status -- orphan --- - orphan @@ -55,7 +55,7 @@ box.info.status -- running --- - running ... -test_run:cmd('restart server quorum2 with args="0.1 0.5"') +test_run:cmd('restart server quorum2 with args="0.1"') box.info.status -- orphan --- - orphan @@ -86,7 +86,7 @@ box.info.status -- running --- - running ... -test_run:cmd('restart server quorum2 with args="0.1 0.5"') +test_run:cmd('restart server quorum2 with args="0.1"') box.info.status -- orphan --- - orphan @@ -103,7 +103,7 @@ box.space.test:replace{100} -- error --- - error: Can't modify data because this instance is in read-only mode. ... -test_run:cmd('start server quorum1 with args="0.1 0.5"') +test_run:cmd('start server quorum1 with args="0.1"') --- - true ... @@ -166,7 +166,7 @@ fiber = require('fiber') fiber.sleep(0.1) --- ... -test_run:cmd('start server quorum1 with args="0.1 0.5"') +test_run:cmd('start server quorum1 with args="0.1"') --- - true ... @@ -204,7 +204,7 @@ test_run:cmd('switch quorum1') --- - true ... -test_run:cmd('restart server quorum1 with cleanup=1, args="0.1 0.5"') +test_run:cmd('restart server quorum1 with cleanup=1, args="0.1"') test_run:wait_cond(function() return box.space.test:count() == 100 end, 20) --- - true @@ -419,10 +419,9 @@ test_run:cmd('create server replica_quorum with script="replication/replica_quor - true ... -- Arguments are: replication_connect_quorum, replication_timeout --- replication_connect_timeout. -- If replication_connect_quorum was ignored here, the instance -- would exit with an error. -test_run:cmd('start server replica_quorum with wait=True, wait_load=True, args="1 0.05 0.1"') +test_run:cmd('start server replica_quorum with wait=True, wait_load=True, args="1 0.05"') --- - true ... diff --git a/test/replication/quorum.test.lua b/test/replication/quorum.test.lua index 5f2872675c15..31be48fc25f9 100644 --- a/test/replication/quorum.test.lua +++ b/test/replication/quorum.test.lua @@ -18,7 +18,7 @@ test_run:cmd('stop server quorum1') test_run:cmd('switch quorum2') -test_run:cmd('restart server quorum2 with args="0.1 0.5"') +test_run:cmd('restart server quorum2 with args="0.1"') box.info.status -- orphan box.ctl.wait_rw(0.001) -- timeout box.info.ro -- true @@ -27,7 +27,7 @@ box.space.test:replace{100} -- error box.cfg{replication={}} box.info.status -- running -test_run:cmd('restart server quorum2 with args="0.1 0.5"') +test_run:cmd('restart server quorum2 with args="0.1"') box.info.status -- orphan box.ctl.wait_rw(0.001) -- timeout box.info.ro -- true @@ -37,12 +37,12 @@ box.ctl.wait_rw() box.info.ro -- false box.info.status -- running -test_run:cmd('restart server quorum2 with args="0.1 0.5"') +test_run:cmd('restart server quorum2 with args="0.1"') box.info.status -- orphan box.ctl.wait_rw(0.001) -- timeout box.info.ro -- true box.space.test:replace{100} -- error -test_run:cmd('start server quorum1 with args="0.1 0.5"') +test_run:cmd('start server quorum1 with args="0.1"') box.ctl.wait_rw() box.info.ro -- false box.info.status -- running @@ -65,7 +65,7 @@ for i = 1, 100 do box.space.test:insert{i} end fiber = require('fiber') fiber.sleep(0.1) -test_run:cmd('start server quorum1 with args="0.1 0.5"') +test_run:cmd('start server quorum1 with args="0.1"') test_run:cmd('switch quorum1') test_run:wait_cond(function() return box.space.test:count() == 100 end, 20) @@ -81,7 +81,7 @@ test_run:cmd('switch quorum2') box.snapshot() test_run:cmd('switch quorum1') -test_run:cmd('restart server quorum1 with cleanup=1, args="0.1 0.5"') +test_run:cmd('restart server quorum1 with cleanup=1, args="0.1"') test_run:wait_cond(function() return box.space.test:count() == 100 end, 20) @@ -157,10 +157,9 @@ test_run:drop_cluster(SERVERS) box.schema.user.grant('guest', 'replication') test_run:cmd('create server replica_quorum with script="replication/replica_quorum.lua"') -- Arguments are: replication_connect_quorum, replication_timeout --- replication_connect_timeout. -- If replication_connect_quorum was ignored here, the instance -- would exit with an error. -test_run:cmd('start server replica_quorum with wait=True, wait_load=True, args="1 0.05 0.1"') +test_run:cmd('start server replica_quorum with wait=True, wait_load=True, args="1 0.05"') test_run:cmd('switch replica_quorum') -- If replication_connect_quorum was ignored here, the instance -- would exit with an error. diff --git a/test/replication/rebootstrap.lua b/test/replication/rebootstrap.lua index 3e7d8f0627a8..e8405e9d9a80 100644 --- a/test/replication/rebootstrap.lua +++ b/test/replication/rebootstrap.lua @@ -6,7 +6,6 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 local function instance_uri(instance_id) return SOCKET_DIR..'/rebootstrap'..instance_id..'.sock'; @@ -19,7 +18,6 @@ box.cfg({ listen = instance_uri(INSTANCE_ID), instance_uuid = '12345678-abcd-1234-abcd-123456789ef' .. INSTANCE_ID, replication_timeout = TIMEOUT, - replication_connect_timeout = CON_TIMEOUT, replication = { instance_uri(1); instance_uri(2); diff --git a/test/replication/rebootstrap.result b/test/replication/rebootstrap.result index ea390c19ff94..d5e4d3967919 100644 --- a/test/replication/rebootstrap.result +++ b/test/replication/rebootstrap.result @@ -20,11 +20,11 @@ test_run:cmd('stop server rebootstrap1') --- - true ... -test_run:cmd('restart server rebootstrap2 with cleanup=True, wait=False, wait_load=False, args="0.1 2.0"') +test_run:cmd('restart server rebootstrap2 with cleanup=True, wait=False, wait_load=False, args="0.1"') --- - true ... -test_run:cmd('start server rebootstrap1 with args="0.1 0.5"') +test_run:cmd('start server rebootstrap1 with args="0.1"') --- - true ... diff --git a/test/replication/rebootstrap.test.lua b/test/replication/rebootstrap.test.lua index 8ddf77912328..f532c43058c8 100644 --- a/test/replication/rebootstrap.test.lua +++ b/test/replication/rebootstrap.test.lua @@ -12,8 +12,8 @@ test_run:wait_fullmesh(SERVERS) -- in 'orphan' mode. -- test_run:cmd('stop server rebootstrap1') -test_run:cmd('restart server rebootstrap2 with cleanup=True, wait=False, wait_load=False, args="0.1 2.0"') -test_run:cmd('start server rebootstrap1 with args="0.1 0.5"') +test_run:cmd('restart server rebootstrap2 with cleanup=True, wait=False, wait_load=False, args="0.1"') +test_run:cmd('start server rebootstrap1 with args="0.1"') test_run:cmd('switch rebootstrap1') box.info.status -- running diff --git a/test/replication/recover_missing_xlog.result b/test/replication/recover_missing_xlog.result index ef4c29e5063f..f240be633438 100644 --- a/test/replication/recover_missing_xlog.result +++ b/test/replication/recover_missing_xlog.result @@ -69,7 +69,7 @@ fio.unlink(list[#list]) --- - true ... -test_run:cmd('start server autobootstrap1 with args="0.1 0.5"') +test_run:cmd('start server autobootstrap1 with args="0.1"') --- - true ... diff --git a/test/replication/recover_missing_xlog.test.lua b/test/replication/recover_missing_xlog.test.lua index 2cd73520f4c8..499107e94f2f 100644 --- a/test/replication/recover_missing_xlog.test.lua +++ b/test/replication/recover_missing_xlog.test.lua @@ -29,7 +29,7 @@ fio = require('fio') -- in 'read-only' mode unless it receives all data. list = fio.glob(fio.pathjoin(fio.abspath("."), 'autobootstrap1/*.xlog')) fio.unlink(list[#list]) -test_run:cmd('start server autobootstrap1 with args="0.1 0.5"') +test_run:cmd('start server autobootstrap1 with args="0.1"') test_run:cmd("switch autobootstrap1") for i = 10, 19 do box.space.test:insert{i, 'test' .. i} end diff --git a/test/replication/replica.lua b/test/replication/replica.lua index 1cd60e062096..f3a6dfe583b1 100644 --- a/test/replication/replica.lua +++ b/test/replication/replica.lua @@ -14,7 +14,6 @@ box.cfg({ replication = repl_list, memtx_memory = 107374182, replication_timeout = 0.1, - replication_connect_timeout = 0.5, }) require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/replica_auth.lua b/test/replication/replica_auth.lua index 22ba9146cb7e..61d046fc47f0 100644 --- a/test/replication/replica_auth.lua +++ b/test/replication/replica_auth.lua @@ -2,7 +2,6 @@ local USER_PASS = arg[1] local TIMEOUT = arg[2] and tonumber(arg[2]) or 0.1 -local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 30.0 require('console').listen(os.getenv('ADMIN')) @@ -10,5 +9,4 @@ box.cfg({ listen = os.getenv("LISTEN"), replication = USER_PASS .. "@" .. os.getenv("MASTER"), replication_timeout = TIMEOUT, - replication_connect_timeout = CON_TIMEOUT }) diff --git a/test/replication/replica_no_quorum.lua b/test/replication/replica_no_quorum.lua index c30c043cc80d..5868eb77b318 100644 --- a/test/replication/replica_no_quorum.lua +++ b/test/replication/replica_no_quorum.lua @@ -6,7 +6,6 @@ box.cfg({ memtx_memory = 107374182, replication_connect_quorum = 0, replication_timeout = 0.1, - replication_connect_timeout = 0.5, }) require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/replica_quorum.lua b/test/replication/replica_quorum.lua index dd42b8214a59..fe51da80277b 100644 --- a/test/replication/replica_quorum.lua +++ b/test/replication/replica_quorum.lua @@ -4,7 +4,6 @@ local SOCKET_DIR = require('fio').cwd() local QUORUM = tonumber(arg[1]) local TIMEOUT = arg[2] and tonumber(arg[2]) or 0.1 -local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 30.0 INSTANCE_URI = SOCKET_DIR .. '/replica_quorum.sock' function nonexistent_uri(id) @@ -16,7 +15,6 @@ require('console').listen(os.getenv('ADMIN')) box.cfg{ listen = INSTANCE_URI, replication_timeout = TIMEOUT, - replication_connect_timeout = CON_TIMEOUT, replication_connect_quorum = QUORUM, replication = {INSTANCE_URI, nonexistent_uri(1), diff --git a/test/replication/replica_timeout.lua b/test/replication/replica_timeout.lua index 38922fa3d37c..34fd9f946f41 100644 --- a/test/replication/replica_timeout.lua +++ b/test/replication/replica_timeout.lua @@ -1,14 +1,12 @@ #!/usr/bin/env tarantool local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 box.cfg({ listen = os.getenv("LISTEN"), replication = os.getenv("MASTER"), memtx_memory = 107374182, replication_timeout = TIMEOUT, - replication_connect_timeout = CON_TIMEOUT, }) require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/replica_uuid.lua b/test/replication/replica_uuid.lua index 4343cfd5b285..72138428a866 100644 --- a/test/replication/replica_uuid.lua +++ b/test/replication/replica_uuid.lua @@ -6,7 +6,6 @@ box.cfg({ replication = os.getenv("MASTER"), memtx_memory = 107374182, replication_timeout = 0.1, - replication_connect_timeout = 0.5, }) require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/replica_uuid_ro.lua b/test/replication/replica_uuid_ro.lua index d5ba55852e02..5c1a2f5b67fa 100644 --- a/test/replication/replica_uuid_ro.lua +++ b/test/replication/replica_uuid_ro.lua @@ -7,7 +7,6 @@ local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[2]) -local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 30.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) @@ -27,7 +26,6 @@ box.cfg({ }; read_only = (INSTANCE_ID ~= '1' and true or false); replication_timeout = TIMEOUT; - replication_connect_timeout = CON_TIMEOUT; }) box.once("bootstrap", function() diff --git a/test/replication/replicaset_ro_mostly.result b/test/replication/replicaset_ro_mostly.result index 1ce7d6f8e09b..a471779d3e1d 100644 --- a/test/replication/replicaset_ro_mostly.result +++ b/test/replication/replicaset_ro_mostly.result @@ -27,7 +27,7 @@ UUID = sort({uuid1, uuid2}, sort_cmp) create_cluster_cmd1 = 'create server %s with script="replication/%s.lua"' --- ... -create_cluster_cmd2 = 'start server %s with args="%s %s", wait_load=False, wait=False' +create_cluster_cmd2 = 'start server %s with args="%s", wait_load=False, wait=False' --- ... test_run:cmd("setopt delimiter ';'") diff --git a/test/replication/replicaset_ro_mostly.test.lua b/test/replication/replicaset_ro_mostly.test.lua index c75af7218702..19cd1fe4afea 100644 --- a/test/replication/replicaset_ro_mostly.test.lua +++ b/test/replication/replicaset_ro_mostly.test.lua @@ -12,7 +12,7 @@ function sort(t) table.sort(t, sort_cmp) return t end UUID = sort({uuid1, uuid2}, sort_cmp) create_cluster_cmd1 = 'create server %s with script="replication/%s.lua"' -create_cluster_cmd2 = 'start server %s with args="%s %s", wait_load=False, wait=False' +create_cluster_cmd2 = 'start server %s with args="%s", wait_load=False, wait=False' test_run:cmd("setopt delimiter ';'") function create_cluster_uuid(servers, uuids) diff --git a/test/replication/wal_off.lua b/test/replication/wal_off.lua index cfd488e4dab0..9da53ba98c9b 100644 --- a/test/replication/wal_off.lua +++ b/test/replication/wal_off.lua @@ -6,7 +6,6 @@ box.cfg({ memtx_memory = 107374182, wal_mode = 'none', replication_timeout = 0.1, - replication_connect_timeout = 0.5, }) require('console').listen(os.getenv('ADMIN'))