[tarantool-patches] [PATCH 01/10] swim: fix an assertion on attempt to chage timeouts

[Vladislav Shpilevoy]

Appeared, that libev does not allow to change ev_timer values in
flight. A timer, reset via ev_timer_set(), should be restarted,
because the function changes 'ev_timer.at', which in turn is used
internally by timer routines.

Part of #3234
---
 src/lib/swim/swim.c    | 17 ++++++++++++-----
 src/lib/swim/swim_ev.h |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/lib/swim/swim.c b/src/lib/swim/swim.c
index 54c5b3250..725ebf222 100644
--- a/src/lib/swim/swim.c
+++ b/src/lib/swim/swim.c
@@ -1797,11 +1797,18 @@ swim_cfg(struct swim *swim, const char *uri, double heartbeat_rate,
 	} else {
 		addr = swim->self->addr;
 	}
-	if (swim->round_tick.repeat != heartbeat_rate && heartbeat_rate > 0)
-		swim_ev_timer_set(&swim->round_tick, 0, heartbeat_rate);
-
-	if (swim->wait_ack_tick.repeat != ack_timeout && ack_timeout > 0)
-		swim_ev_timer_set(&swim->wait_ack_tick, 0, ack_timeout);
+	struct ev_timer *t = &swim->round_tick;
+	if (t->repeat != heartbeat_rate && heartbeat_rate > 0) {
+		swim_ev_timer_set(t, 0, heartbeat_rate);
+		if (swim_ev_is_active(t))
+			swim_ev_timer_again(loop(), t);
+	}
+	t = &swim->wait_ack_tick;
+	if (t->repeat != ack_timeout && ack_timeout > 0) {
+		swim_ev_timer_set(t, 0, ack_timeout);
+		if (swim_ev_is_active(t))
+			swim_ev_timer_again(loop(), t);
+	}
 
 	if (new_self != NULL) {
 		swim->self->status = MEMBER_LEFT;
diff --git a/src/lib/swim/swim_ev.h b/src/lib/swim/swim_ev.h
index b68ed9e19..fe261ff38 100644
--- a/src/lib/swim/swim_ev.h
+++ b/src/lib/swim/swim_ev.h
@@ -52,6 +52,8 @@ swim_ev_timer_again(struct ev_loop *loop, struct ev_timer *watcher);
 void
 swim_ev_timer_stop(struct ev_loop *loop, struct ev_timer *watcher);
 
+#define swim_ev_is_active ev_is_active
+
 #define swim_ev_init ev_init
 
 #define swim_ev_timer_init ev_timer_init
-- 
2.20.1 (Apple Git-117)