From a3cf05574f3f72167db8e3f2b85216f1e82eab7c Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Mon, 19 Jul 2021 16:50:48 +0000
Subject: [PATCH] We need to periodically flush the GC or we'll end up blocking
 with a huge backlog at the end of load

Former-commit-id: 29c0bf79ad1a810e808790de2f7db24f3cc603e8
---
 src/rdb.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rdb.cpp b/src/rdb.cpp
index 4975918a8..957c3fa88 100644
--- a/src/rdb.cpp
+++ b/src/rdb.cpp
@@ -2884,6 +2884,8 @@ int rdbLoadRio(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
                 do this every 16 keys to limit the perf impact */
             if (g_pserver->m_pstorageFactory && (ckeysLoaded % 128) == 0)
             {
+                g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
+                serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
                 bool fHighMemory = (getMaxmemoryState(NULL,NULL,NULL,NULL) != C_OK);
                 if (fHighMemory || (ckeysLoaded % (1024)) == 0)
                 {