From c2220fe41ecc3be23b0bc22670eb046660621c8b Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 25 May 2018 21:10:16 +0300
Subject: [PATCH] test: update replication_connect_timeout in tests to a lower
value
---
test/replication/autobootstrap.lua | 1 +
test/replication/autobootstrap_guest.lua | 1 +
test/replication/ddl.lua | 1 +
test/replication/hot_standby.lua | 1 +
test/replication/master.lua | 1 +
test/replication/on_replace.lua | 1 +
test/replication/rebootstrap.lua | 5 +++--
test/replication/replica.lua | 1 +
test/replication/replica_timeout.lua | 1 +
test/replication/replica_uuid.lua | 1 +
test/replication/replica_uuid_ro.lua | 1 +
test/replication/wal_off.lua | 1 +
12 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/test/replication/autobootstrap.lua b/test/replication/autobootstrap.lua
index c96f750dba..4f55417ae0 100644
--- a/test/replication/autobootstrap.lua
+++ b/test/replication/autobootstrap.lua
@@ -21,6 +21,7 @@ box.cfg({
USER..':'..PASSWORD..'@'..instance_uri(2);
USER..':'..PASSWORD..'@'..instance_uri(3);
};
+ replication_connect_timeout = 0.5,
})
box.once("bootstrap", function()
diff --git a/test/replication/autobootstrap_guest.lua b/test/replication/autobootstrap_guest.lua
index a34ad96de2..40fef2c7a2 100644
--- a/test/replication/autobootstrap_guest.lua
+++ b/test/replication/autobootstrap_guest.lua
@@ -20,6 +20,7 @@ box.cfg({
instance_uri(2);
instance_uri(3);
};
+ replication_connect_timeout = 0.5,
})
box.once("bootstrap", function()
diff --git a/test/replication/ddl.lua b/test/replication/ddl.lua
index 606b202ab5..694f40eac3 100644
--- a/test/replication/ddl.lua
+++ b/test/replication/ddl.lua
@@ -22,6 +22,7 @@ box.cfg({
USER..':'..PASSWORD..'@'..instance_uri(3);
USER..':'..PASSWORD..'@'..instance_uri(4);
};
+ replication_connect_timeout = 0.5,
})
box.once("bootstrap", function()
diff --git a/test/replication/hot_standby.lua b/test/replication/hot_standby.lua
index aeb4c01a13..4ba8bb2c4b 100644
--- a/test/replication/hot_standby.lua
+++ b/test/replication/hot_standby.lua
@@ -9,5 +9,6 @@ box.cfg({
memtx_dir = "master",
vinyl_dir = "master",
hot_standby = true,
+ replication_connect_timeout = 0.5,
})
diff --git a/test/replication/master.lua b/test/replication/master.lua
index 0f9f7a6f0b..6d431aaebd 100644
--- a/test/replication/master.lua
+++ b/test/replication/master.lua
@@ -3,6 +3,7 @@ os = require('os')
box.cfg({
listen = os.getenv("LISTEN"),
memtx_memory = 107374182,
+ replication_connect_timeout = 0.5,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/on_replace.lua b/test/replication/on_replace.lua
index 7e49efe1f7..03f15d94cf 100644
--- a/test/replication/on_replace.lua
+++ b/test/replication/on_replace.lua
@@ -20,6 +20,7 @@ box.cfg({
USER..':'..PASSWORD..'@'..instance_uri(1);
USER..':'..PASSWORD..'@'..instance_uri(2);
};
+ replication_connect_timeout = 0.5,
})
env = require('test_run')
diff --git a/test/replication/rebootstrap.lua b/test/replication/rebootstrap.lua
index 0b67e7b0ea..e743577e41 100644
--- a/test/replication/rebootstrap.lua
+++ b/test/replication/rebootstrap.lua
@@ -12,9 +12,10 @@ end
require('console').listen(os.getenv('ADMIN'))
box.cfg({
- listen = instance_uri(INSTANCE_ID);
+ listen = instance_uri(INSTANCE_ID),
instance_uuid = '12345678-abcd-1234-abcd-123456789ef' .. INSTANCE_ID,
- replication_timeout = 0.1;
+ replication_timeout = 0.1,
+ replication_connect_timeout = 0.5,
replication = {
instance_uri(1);
instance_uri(2);
diff --git a/test/replication/replica.lua b/test/replication/replica.lua
index ed0ba38cc8..81bd02a4c3 100644
--- a/test/replication/replica.lua
+++ b/test/replication/replica.lua
@@ -4,6 +4,7 @@ box.cfg({
listen = os.getenv("LISTEN"),
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
+ replication_connect_timeout = 0.5,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/replica_timeout.lua b/test/replication/replica_timeout.lua
index 34fd9f946f..64f119763d 100644
--- a/test/replication/replica_timeout.lua
+++ b/test/replication/replica_timeout.lua
@@ -7,6 +7,7 @@ box.cfg({
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
replication_timeout = TIMEOUT,
+ replication_connect_timeout = TIMEOUT * 3,
})
require('console').listen(os.getenv('ADMIN'))
diff --git a/test/replication/replica_uuid.lua b/test/replication/replica_uuid.lua
index f92d3119ad..027ba1a65b 100644
--- a/test/replication/replica_uuid.lua
+++ b/test/replication/replica_uuid.lua
@@ -5,6 +5,7 @@ box.cfg({
listen = os.getenv("LISTEN"),
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
+ 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 dd5dae9e88..8e1c6cc475 100644
--- a/test/replication/replica_uuid_ro.lua
+++ b/test/replication/replica_uuid_ro.lua
@@ -22,6 +22,7 @@ box.cfg({
USER..':'..PASSWORD..'@'..instance_uri(2);
};
read_only = (INSTANCE_ID ~= '1' and true or false);
+ replication_connect_timeout = 0.5,
})
box.once("bootstrap", function()
diff --git a/test/replication/wal_off.lua b/test/replication/wal_off.lua
index e56272fc7e..2edd17af8b 100644
--- a/test/replication/wal_off.lua
+++ b/test/replication/wal_off.lua
@@ -5,6 +5,7 @@ box.cfg({
replication = os.getenv("MASTER"),
memtx_memory = 107374182,
wal_mode = 'none',
+ replication_connect_timeout = 0.5,
})
require('console').listen(os.getenv('ADMIN'))
--
GitLab