From c6a0c7b04f873aede35622c7d544710582bcc520 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Wed, 11 Aug 2021 01:19:39 +0000
Subject: [PATCH] Fix crash in load with storage provider set

Former-commit-id: 6990818b7ca647819b50ae04224778e6f8f12a1a
---
 src/rdb.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rdb.cpp b/src/rdb.cpp
index cef3d15dd..ec4be50e0 100644
--- a/src/rdb.cpp
+++ b/src/rdb.cpp
@@ -3195,8 +3195,10 @@ int rdbLoadRio(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
         ckeysLoaded++;
         if (g_pserver->m_pstorageFactory && (ckeysLoaded % 128) == 0)
         {
-            g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
-            serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
+            if (!serverTL->gcEpoch.isReset()) {
+                g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
+                serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
+            }
         }
 
         if (g_pserver->key_load_delay)