Fix replication rdb load timeout (#251)

msotheeswaran-sc · GitHub Enterprise · commit 5681d067a69f · 2024-01-30T14:22:51.000-05:00
* don't timeout replication when loading rdb

* fix bracket placement
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);

Original file line number	Diff line number	Diff line change
`@@ -4823,7 +4823,8 @@ void replicationCron(void) {`
`4823`	`4823`
`4824`	`4824`	`/* Bulk transfer I/O timeout? */`
`4825`	`4825`	`if (mi->masterhost && mi->repl_state == REPL_STATE_TRANSFER &&`
`4826`		`- (time(NULL)-mi->repl_transfer_lastio) > g_pserver->repl_timeout)`
	`4826`	`+ (time(NULL)-mi->repl_transfer_lastio) > g_pserver->repl_timeout &&`
	`4827`	`+ !(g_pserver->loading & LOADING_REPLICATION))`
`4827`	`4828`	`{`
`4828`	`4829`	`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.");`
`4829`	`4830`	`cancelReplicationHandshake(mi,true);`