From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 7A58E46970F for ; Thu, 21 Nov 2019 11:26:02 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Thu, 21 Nov 2019 11:25:55 +0300 Message-Id: <11842f61682c057d3e11ff51c32f31e080fc2bea.1574324040.git.avtikhon@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v1 1/2] test: use default replication connection timeout List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Removed all local connection timeout setups, where it is not the part of the testing scenario. Instead of it the default value will be used. Also it is more comfortable to change the single default value instead of the change this value at each of the test scenarios, it will help to avoid of flaky results in tests beacuse of different timeout vlaues. The most of tests used the replication connection timeout is equal to 0.5 second, while defualt value is set at sources file: src/box/lua/load_cfg.lua to the value of 30 seconds: replication_connect_timeout = 30 which is quite enough for all of the tests that don't need any special values for it. Part of #2058 --- test/replication/autobootstrap.lua | 2 -- test/replication/autobootstrap.result | 2 +- test/replication/autobootstrap.test.lua | 2 +- test/replication/autobootstrap_guest.lua | 2 -- test/replication/before_replace.result | 6 +++--- test/replication/before_replace.test.lua | 6 +++--- test/replication/ddl.lua | 2 -- test/replication/hot_standby.lua | 1 - test/replication/master.lua | 1 - test/replication/master_quorum.lua | 2 -- test/replication/on_replace.lua | 2 -- test/replication/quorum.lua | 2 -- test/replication/quorum.result | 15 +++++++-------- test/replication/quorum.test.lua | 15 +++++++-------- test/replication/rebootstrap.lua | 2 -- test/replication/rebootstrap.result | 4 ++-- test/replication/rebootstrap.test.lua | 4 ++-- test/replication/recover_missing_xlog.result | 2 +- test/replication/recover_missing_xlog.test.lua | 2 +- test/replication/replica.lua | 1 - test/replication/replica_auth.lua | 2 -- test/replication/replica_no_quorum.lua | 1 - test/replication/replica_quorum.lua | 2 -- test/replication/replica_timeout.lua | 2 -- test/replication/replica_uuid.lua | 1 - test/replication/replica_uuid_ro.lua | 2 -- test/replication/replicaset_ro_mostly.result | 2 +- test/replication/replicaset_ro_mostly.test.lua | 2 +- test/replication/wal_off.lua | 1 - 29 files changed, 30 insertions(+), 60 deletions(-) diff --git a/test/replication/autobootstrap.lua b/test/replication/autobootstrap.lua index 856b36e66..6d01fb2da 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 743982d47..ec9667663 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 055ea4277..8c75d1322 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 d7176ae5b..54febd1b6 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 ced40547e..ce66718d1 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 bcc6dc00d..3b9910cbc 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 72cf1db69..2db977d46 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 cd53fc776..30742ce4f 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 9b96b7891..e924b5495 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 05272ac5e..20f161cc0 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 40c12a9ea..71e63d3f9 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 f61c8748f..129e676e0 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 ff5fa0150..ae2d9697c 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 @@ -51,7 +51,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 @@ -82,7 +82,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 @@ -99,7 +99,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 ... @@ -158,7 +158,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 ... @@ -196,7 +196,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"') box.space.test:count() -- 100 --- - 100 @@ -411,10 +411,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 98febb367..3c875deea 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 @@ -26,7 +26,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 @@ -36,12 +36,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 @@ -63,7 +63,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') box.space.test:count() -- 100 @@ -79,7 +79,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"') box.space.test:count() -- 100 @@ -156,10 +156,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 3e7d8f062..e8405e9d9 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 ea390c19f..d5e4d3967 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 8ddf77912..f532c4305 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 ef4c29e50..f240be633 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 2cd73520f..499107e94 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 20ac064e1..b8ab87c33 100644 --- a/test/replication/replica.lua +++ b/test/replication/replica.lua @@ -5,7 +5,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_auth.lua b/test/replication/replica_auth.lua index 22ba9146c..61d046fc4 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 c30c043cc..5868eb77b 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 dd42b8214..fe51da802 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 38922fa3d..34fd9f946 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 4343cfd5b..72138428a 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 d5ba55852..5c1a2f5b6 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 1ce7d6f8e..a471779d3 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 c75af7218..19cd1fe4a 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 cfd488e4d..9da53ba98 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')) -- 2.17.1