fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Replication: start BGSAVE for replication always in replicationCron().

Browse Source 
This makes the replication code conceptually simpler by removing the
synchronous BGSAVE trigger in syncCommand(). This also means that
socket and disk BGSAVE targets are handled by the same code.
This commit is contained in:
antirez 2016-07-21 12:10:56 +02:00
parent e0582b3598
commit 780a8b1d76
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/replication.c
View File

@ -647,7 +647,7 @@ void syncCommand(client *c) {
} else { } else {
/* No way, we need to wait for the next BGSAVE in order to /* No way, we need to wait for the next BGSAVE in order to
* register differences. */ * register differences. */
serverLog(LL_NOTICE,"Waiting for next BGSAVE for SYNC"); serverLog(LL_NOTICE,"Can't attach the slave to the current BGSAVE. Waiting for next BGSAVE for SYNC");
} }
/* CASE 2: BGSAVE is in progress, with socket target. */ /* CASE 2: BGSAVE is in progress, with socket target. */
@ -657,7 +657,7 @@ void syncCommand(client *c) {
/* There is an RDB child process but it is writing directly to /* There is an RDB child process but it is writing directly to
* children sockets. We need to wait for the next BGSAVE * children sockets. We need to wait for the next BGSAVE
* in order to synchronize. */ * in order to synchronize. */
serverLog(LL_NOTICE,"Waiting for next BGSAVE for SYNC"); serverLog(LL_NOTICE,"Current BGSAVE has socket target. Waiting for next BGSAVE for SYNC");
/* CASE 3: There is no BGSAVE is progress. */ /* CASE 3: There is no BGSAVE is progress. */
} else { } else {
@ -671,7 +671,7 @@ void syncCommand(client *c) {
/* Target is disk (or the slave is not capable of supporting /* Target is disk (or the slave is not capable of supporting
* diskless replication) and we don't have a BGSAVE in progress, * diskless replication) and we don't have a BGSAVE in progress,
* let's start one. */ * let's start one. */
if (startBgsaveForReplication(c->slave_capa) != C_OK) return; serverLog(LL_NOTICE,"No BGSAVE in progress. Starting one ASAP");
} }
} }
@ -2307,13 +2307,12 @@ void replicationCron(void) {
replicationScriptCacheFlush(); replicationScriptCacheFlush();
} }
/* If we are using diskless replication and there are slaves waiting /* Start a BGSAVE good for replication if we have slaves in
* in WAIT_BGSAVE_START state, check if enough seconds elapsed and * WAIT_BGSAVE_START state.
* start a BGSAVE.
* *
* This code is also useful to trigger a BGSAVE if the diskless * In case of diskless replication, we make sure to wait the specified
* replication was turned off with CONFIG SET, while there were already * number of seconds (according to configuration) so that other slaves
* slaves in WAIT_BGSAVE_START state. */ * have the time to arrive before we start streaming. */
if (server.rdb_child_pid == -1 && server.aof_child_pid == -1) { if (server.rdb_child_pid == -1 && server.aof_child_pid == -1) {
time_t idle, max_idle = 0; time_t idle, max_idle = 0;
int slaves_waiting = 0; int slaves_waiting = 0;
@ -2333,9 +2332,13 @@ void replicationCron(void) {
} }
} }
if (slaves_waiting && max_idle > server.repl_diskless_sync_delay) { if (slaves_waiting &&
/* Start a BGSAVE. Usually with socket target, or with disk target (!server.repl_diskless_sync ||
* if there was a recent socket -> disk config change. */ max_idle > server.repl_diskless_sync_delay))
{
/* Start the BGSAVE. The called function may start a
* BGSAVE with socket target or disk target depending on the
* configuration and slaves capabilities. */
startBgsaveForReplication(mincapa); startBgsaveForReplication(mincapa);
} }
} }