test: use default replication connection timeout

All local connection timeout settings not related to the testing
scenario are removed within this change. Instead of removed values
the default one from src/box/lua/load_cfg.lua will be used.
The approach with a single default value helps to avoid flaky test
results regarding different timeout values and makes the future
maintainence easier.

The change is required for LSAN and ASAN testing machinery since it
introduces a little overhead and cause failures for tests with
excessively strict time limits.

Needed for #2058

(cherry picked from commit fb892b7)

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()

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})
 ---
 ...

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()

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()

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]

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.

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()

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,
 })
 

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
 })
 

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()

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()

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);

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
 ...

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.

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);

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
 ...

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
 

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
 ...

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

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'))

test/replication/replica_auth.lua

@@ -2,13 +2,11 @@
 
 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'))
 
 box.cfg({
     listen = os.getenv("LISTEN"),
     replication = USER_PASS .. "@" .. os.getenv("MASTER"),
     replication_timeout = TIMEOUT,
-    replication_connect_timeout = CON_TIMEOUT
 })

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'))