From ecd65cf9cf579946ce32068da6c841bfa2a8b831 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Wed, 10 Jul 2019 12:36:14 +0200
Subject: [PATCH] Diskless replica: fix disklessLoadRestoreBackups() bug.

---
 src/replication.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/replication.c b/src/replication.c
index a89552a8d..26e7cf8f0 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -1138,16 +1138,16 @@ redisDb *disklessLoadMakeBackups(void) {
  *
  * If the socket loading went wrong, we want to restore the old backups
  * into the server databases. This function does just that in the case
- * the 'count' argument (the number of DBs to replace) is non-zero.
+ * the 'restore' argument (the number of DBs to replace) is non-zero.
  *
  * When instead the loading succeeded we want just to free our old backups,
- * in that case the funciton will do just that when 'count' is 0. */
-void disklessLoadRestoreBackups(redisDb *backup, int count, int empty_db_flags)
+ * in that case the funciton will do just that when 'restore' is 0. */
+void disklessLoadRestoreBackups(redisDb *backup, int restore, int empty_db_flags)
 {
-    if (count) {
+    if (restore) {
         /* Restore. */
         emptyDbGeneric(server.db,-1,empty_db_flags,replicationEmptyDbCallback);
-        for (int i=0; i<count; i++) {
+        for (int i=0; i<server.dbnum; i++) {
             dictRelease(server.db[i].dict);
             dictRelease(server.db[i].expires);
             server.db[i] = backup[i];
@@ -1155,7 +1155,7 @@ void disklessLoadRestoreBackups(redisDb *backup, int count, int empty_db_flags)
     } else {
         /* Delete. */
         emptyDbGeneric(backup,-1,empty_db_flags,replicationEmptyDbCallback);
-        for (int i=0; i<count; i++) {
+        for (int i=0; i<server.dbnum; i++) {
             dictRelease(backup[i].dict);
             dictRelease(backup[i].expires);
         }
@@ -1382,7 +1382,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
             rioFreeFd(&rdb, NULL);
             if (server.repl_diskless_load == REPL_DISKLESS_LOAD_SWAPDB) {
                 /* Restore the backed up databases. */
-                disklessLoadRestoreBackups(diskless_load_backup,server.dbnum,
+                disklessLoadRestoreBackups(diskless_load_backup,1,
                                            empty_db_flags);
             } else {
                 /* Remove the half-loaded data in case we started with