From 0b220bddc7ab4f08cd412616ab85b96f3f633966 Mon Sep 17 00:00:00 2001 From: John Sully Date: Sun, 18 Jul 2021 20:28:42 +0000 Subject: [PATCH] Do not update batch variables when not in a batch Former-commit-id: ad1e0286cf9b2d9de33c65e8e798a05ead3f7d5a --- src/replication.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/replication.cpp b/src/replication.cpp index b9465680e..7eabeef6b 100644 --- a/src/replication.cpp +++ b/src/replication.cpp @@ -254,9 +254,11 @@ void resizeReplicationBacklog(long long newsize) { zfree(g_pserver->repl_backlog); g_pserver->repl_backlog = backlog; g_pserver->repl_backlog_idx = g_pserver->repl_backlog_histlen; - g_pserver->repl_batch_idxStart -= earliest_idx; - if (g_pserver->repl_batch_idxStart < 0) - g_pserver->repl_batch_idxStart += g_pserver->repl_backlog_size; + if (g_pserver->repl_batch_idxStart >= 0) { + g_pserver->repl_batch_idxStart -= earliest_idx; + if (g_pserver->repl_batch_idxStart < 0) + g_pserver->repl_batch_idxStart += g_pserver->repl_backlog_size; + } g_pserver->repl_backlog_start = earliest_off; } else { zfree(g_pserver->repl_backlog);