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

PSYNC2: persist cached_master's dbid inside the RDB

Browse Source
This commit is contained in:
zhaozhao.zz 2017-11-04 23:05:00 +08:00
parent 93037f7642
commit ea2e51c630
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rdb.c
View File

@ -2054,11 +2054,25 @@ rdbSaveInfo *rdbPopulateSaveInfo(rdbSaveInfo *rsi) {
return rsi; return rsi;
} }
/* If the instance is a slave we need a connected master in order to /* If the instance is a slave we need a connected master
* fetch the currently selected DB. */ * in order to fetch the currently selected DB. */
if (server.master) { if (server.master) {
rsi->repl_stream_db = server.master->db->id; rsi->repl_stream_db = server.master->db->id;
return rsi; return rsi;
} }
/* It is useful to persist cached_master's db id inside RDB file.
* When a slave lost master's connection, server.master will be
* cached as server.cached_master, after that a slave can not
* increment the master_repl_offset because slave only apply data
* from connected master, so the cached_master can hold right
* replication info. But please note that this action is safe
* only after we fix the free backlog problem, because when a master
* turn to be a slave, it will use itself as the server.cached_master,
* that is dangerous if we didn't use a new replication ID after
* free backlog. */
if (server.cached_master) {
rsi->repl_stream_db = server.cached_master->db->id;
return rsi;
}
return NULL; return NULL;
} }