diff --git a/src/box/applier.cc b/src/box/applier.cc index 0e66382cf088f1542fb93fffae2e0c3c038a7aae..f99649217c7425e249757cea243f26b7ac785e3f 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 d4f2128db5df6e931f26fa331e87ba8e0c22efcd..a9ccb5caec1f79da3bfee801e2378c0301c9b855 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 34845a41a37ce62cf2c8e5cedba608ac7fce6e0f..115f52e49055ebb4542cbd053d4bc7664b5f9a5a 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 80153e386133f1b2a493056f83aaa30727ac0807..eea9f5bcfd63d0e6bfb08b7a8199fb1937915bfc 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 7a3e937b1a83a3a355f041797dad45511398f6e7..c3e318a6a4a2639ad392e02971c5cd45d7a76c22 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 67539cd175647101bafe4346b575177b5529b766..e7917681b6d1683bb1a97e3a72405c96e783f308 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