BUG/MEDIUM: peers: re-work updates lookup during the sync on the fly
Only entries between the opposite of the last 'local update' rotating
counter were considered to be pushed. This processing worked in most
cases because updates are continually pushed trying to reach this point
but it remains some cases where updates id are more far away in the past
and appearing in futur and the push of updates is stuck until the head
reach again the tail which could take a very long time.
This patch re-work the lookup to consider that all positions on the
rotating counter is considered in the past until we reach exactly
the 'local update' value. Doing this, the updates push won't be stuck
anymore.
This patch should be backported on all supported branches ( >= 1.6 )
diff --git a/src/peers.c b/src/peers.c
index 16a2fdb..a012106 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1331,13 +1331,17 @@
eb = eb32_lookup_ge(&st->table->updates, st->last_pushed+1);
if (!eb) {
eb = eb32_first(&st->table->updates);
- if (!eb || ((int)(eb->key - st->last_pushed) <= 0)) {
+ if (!eb || (eb->key == st->last_pushed)) {
st->table->commitupdate = st->last_pushed = st->table->localupdate;
return NULL;
}
}
- if ((int)(eb->key - st->table->localupdate) > 0) {
+ /* if distance between the last pushed and the retrieved key
+ * is greater than the distance last_pushed and the local_update
+ * this means we are beyond localupdate.
+ */
+ if ((eb->key - st->last_pushed) > (st->table->localupdate - st->last_pushed)) {
st->table->commitupdate = st->last_pushed = st->table->localupdate;
return NULL;
}
@@ -2217,7 +2221,7 @@
if (!(peer->flags & PEER_F_TEACH_PROCESS)) {
HA_SPIN_LOCK(STK_TABLE_LOCK, &st->table->lock);
if (!(peer->flags & PEER_F_LEARN_ASSIGN) &&
- ((int)(st->last_pushed - st->table->localupdate) < 0)) {
+ (st->last_pushed != st->table->localupdate)) {
repl = peer_send_teach_process_msgs(appctx, peer, st);
if (repl <= 0) {
@@ -3003,7 +3007,7 @@
/* Awake session if there is data to push */
for (st = ps->tables; st ; st = st->next) {
- if ((int)(st->last_pushed - st->table->localupdate) < 0) {
+ if (st->last_pushed != st->table->localupdate) {
/* wake up the peer handler to push local updates */
update_to_push = 1;
/* There is no need to send a heartbeat message
@@ -3140,7 +3144,7 @@
/* current peer connection is active and established
* wake up all peer handlers to push remaining local updates */
for (st = ps->tables; st ; st = st->next) {
- if ((int)(st->last_pushed - st->table->localupdate) < 0) {
+ if (st->last_pushed != st->table->localupdate) {
appctx_wakeup(ps->appctx);
break;
}