3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3436 from sigiesec/fix-reconnect-ivl-calculation

Browse Source 
Problem: reconnect interval exponential backoff and may lead to integ…
This commit is contained in:
Luca Boccassi 2019-02-27 14:41:41 +00:00 committed by GitHub
commit 995e0a3a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/stream_connecter_base.cpp
View File

@ -39,6 +39,8 @@
#include <winsock2.h> #include <winsock2.h>
#endif #endif
#include <limits>
zmq::stream_connecter_base_t::stream_connecter_base_t ( zmq::stream_connecter_base_t::stream_connecter_base_t (
zmq::io_thread_t *io_thread_, zmq::io_thread_t *io_thread_,
zmq::session_base_t *session_, zmq::session_base_t *session_,
@ -108,17 +110,28 @@ void zmq::stream_connecter_base_t::add_reconnect_timer ()
int zmq::stream_connecter_base_t::get_new_reconnect_ivl () int zmq::stream_connecter_base_t::get_new_reconnect_ivl ()
{ {
// The new interval is the current interval + random value. // TODO should the random jitter be really based on the configured initial
const int interval = // reconnect interval options.reconnect_ivl, or better on the
_current_reconnect_ivl + generate_random () % options.reconnect_ivl; // _current_reconnect_ivl?
// Only change the current reconnect interval if the maximum reconnect // The new interval is the current interval + random value.
const int random_jitter = generate_random () % options.reconnect_ivl;
const int interval =
_current_reconnect_ivl < std::numeric_limits<int>::max () - random_jitter
? _current_reconnect_ivl + random_jitter
: std::numeric_limits<int>::max ();
// Only change the new current reconnect interval if the maximum reconnect
// interval was set and if it's larger than the reconnect interval. // interval was set and if it's larger than the reconnect interval.
if (options.reconnect_ivl_max > 0 if (options.reconnect_ivl_max > 0
&& options.reconnect_ivl_max > options.reconnect_ivl) && options.reconnect_ivl_max > options.reconnect_ivl) {
// Calculate the next interval // Calculate the next interval
_current_reconnect_ivl = _current_reconnect_ivl =
std::min (_current_reconnect_ivl * 2, options.reconnect_ivl_max); _current_reconnect_ivl < std::numeric_limits<int>::max () / 2
? std::min (_current_reconnect_ivl * 2, options.reconnect_ivl_max)
: options.reconnect_ivl_max;
}
return interval; return interval;
} }