From f29756e4cbf70bbfcf02172bf06fafad5647eb16 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Tue, 21 Apr 2020 21:39:36 -0400
Subject: [PATCH] Periodically FLASH flush write queues during RDB load

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

diff --git a/src/rdb.cpp b/src/rdb.cpp
index bed43f340..975d12a63 100644
--- a/src/rdb.cpp
+++ b/src/rdb.cpp
@@ -2486,13 +2486,13 @@ int rdbLoadRio(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
                 do this every 16 keys to limit the perf impact */
             if (g_pserver->m_pstorageFactory && (ckeysLoaded % 16) == 0)
             {
-                if (getMaxmemoryState(NULL,NULL,NULL,NULL) != C_OK)
+                if (getMaxmemoryState(NULL,NULL,NULL,NULL) != C_OK || (ckeysLoaded % (1024)) == 0)
                 {
                     for (int idb = 0; idb < cserver.dbnum; ++idb)
                     {
                         g_pserver->db[idb]->processChanges();
                         g_pserver->db[idb]->commitChanges();
-                        g_pserver->db[idb]->trackChanges(true);
+                        g_pserver->db[idb]->trackChanges(false);
                     }
                     freeMemoryIfNeeded();
                 }