From 06a63686ae3b9e1fb21e69a0b396842240003e7a Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 25 May 2018 17:59:19 +0300
Subject: [PATCH] replication: change default replication_connect_timeout to 30
seconds
The default of 4 seconds is too low to bootstrap a large cluster.
---
src/box/applier.cc | 4 ++--
src/box/lua/load_cfg.lua | 2 +-
src/box/replication.h | 2 +-
test/app-tap/init_script.result | 2 +-
test/box/admin.result | 2 +-
test/box/cfg.result | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/box/applier.cc b/src/box/applier.cc
index 0e66382cf0..f99649217c 100644
--- a/src/box/applier.cc
+++ b/src/box/applier.cc
@@ -92,7 +92,7 @@ applier_log_error(struct applier *applier, struct error *e)
error_log(e);
if (type_cast(SocketError, e) || type_cast(SystemError, e))
say_info("will retry every %.2lf second",
- replication_reconnect_timeout());
+ replication_reconnect_interval());
applier->last_logged_errcode = errcode;
}
@@ -644,7 +644,7 @@ applier_f(va_list ap)
*/
reconnect:
applier_disconnect(applier, APPLIER_DISCONNECTED);
- fiber_sleep(replication_reconnect_timeout());
+ fiber_sleep(replication_reconnect_interval());
}
return 0;
}
diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index d4f2128db5..a9ccb5caec 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -57,7 +57,7 @@ local default_cfg = {
worker_pool_threads = 4,
replication_timeout = 1,
replication_sync_lag = 10,
- replication_connect_timeout = 4,
+ replication_connect_timeout = 30,
replication_connect_quorum = nil, -- connect all
}
diff --git a/src/box/replication.h b/src/box/replication.h
index 34845a41a3..115f52e490 100644
--- a/src/box/replication.h
+++ b/src/box/replication.h
@@ -130,7 +130,7 @@ extern double replication_sync_lag;
* to a master.
*/
static inline double
-replication_reconnect_timeout(void)
+replication_reconnect_interval(void)
{
return replication_timeout;
}
diff --git a/test/app-tap/init_script.result b/test/app-tap/init_script.result
index 80153e3861..eea9f5bcfd 100644
--- a/test/app-tap/init_script.result
+++ b/test/app-tap/init_script.result
@@ -21,7 +21,7 @@ box.cfg
16 pid_file:box.pid
17 read_only:false
18 readahead:16320
-19 replication_connect_timeout:4
+19 replication_connect_timeout:30
20 replication_sync_lag:10
21 replication_timeout:1
22 rows_per_wal:500000
diff --git a/test/box/admin.result b/test/box/admin.result
index 7a3e937b1a..c3e318a6a4 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -55,7 +55,7 @@ cfg_filter(box.cfg)
- - readahead
- 16320
- - replication_connect_timeout
- - 4
+ - 30
- - replication_sync_lag
- 10
- - replication_timeout
diff --git a/test/box/cfg.result b/test/box/cfg.result
index 67539cd175..e7917681b6 100644
--- a/test/box/cfg.result
+++ b/test/box/cfg.result
@@ -51,7 +51,7 @@ cfg_filter(box.cfg)
- - readahead
- 16320
- - replication_connect_timeout
- - 4
+ - 30
- - replication_sync_lag
- 10
- - replication_timeout
@@ -140,7 +140,7 @@ cfg_filter(box.cfg)
- - readahead
- 16320
- - replication_connect_timeout
- - 4
+ - 30
- - replication_sync_lag
- 10
- - replication_timeout
--
GitLab