Fix replication rdb load timeout (#251)

* don't timeout replication when loading rdb * fix bracket placement
Snapchat · Jan 30, 2024 · 5681d06 · 5681d06
1 parent d1484aa
commit 5681d06
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/replication.cpp b/src/replication.cpp
@@ -4823,7 +4823,8 @@ void replicationCron(void) {
 
         /* Bulk transfer I/O timeout? */
         if (mi->masterhost && mi->repl_state == REPL_STATE_TRANSFER &&
-            (time(NULL)-mi->repl_transfer_lastio) > g_pserver->repl_timeout)
+            (time(NULL)-mi->repl_transfer_lastio) > g_pserver->repl_timeout &&
+            !(g_pserver->loading & LOADING_REPLICATION))
         {
             serverLog(LL_WARNING,"Timeout receiving bulk data from MASTER... If the problem persists try to set the 'repl-timeout' parameter in keydb.conf to a larger value.");
             cancelReplicationHandshake(mi,true);