From 5218d1b206ecca09c9bacf202bcc8ad3b20475a3 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Wed, 11 Aug 2021 02:53:44 +0000
Subject: [PATCH] Fix crash loading RDB on start with a storage provider set

Former-commit-id: ace6a44399a15ab48a7ef798dc656dbc1207b58d
---
 src/server.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server.cpp b/src/server.cpp
index a88e13d74..ef1039cea 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -6757,6 +6757,7 @@ void loadDataFromDisk(void) {
         serverLog(LL_NOTICE, "Loading the RDB even though we have a storage provider because the database is empty");
     }
     
+    serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
     if (g_pserver->aof_state == AOF_ON) {
         if (loadAppendOnlyFile(g_pserver->aof_filename) == C_OK)
             serverLog(LL_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000);
@@ -6802,6 +6803,8 @@ void loadDataFromDisk(void) {
             exit(1);
         }
     }
+    g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
+    serverTL->gcEpoch.reset();
 }
 
 void redisOutOfMemoryHandler(size_t allocation_size) {