gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix active rep not merging on sync and add tests

Browse Source 
Former-commit-id: fcb77d0431b195553eb1cd563286e5441f0c94cd
This commit is contained in:
John Sully 2020-01-29 13:26:04 -05:00
parent dc4d3a607f
commit 2e84764f1b
2 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/replication.cpp
View File

@ -1872,6 +1872,9 @@ void readSyncBulkPayload(connection *conn) {
/* We need to stop any AOF rewriting child before flusing and parsing
* the RDB, otherwise we'll create a copy-on-write disaster. */
if (g_pserver->aof_state != AOF_OFF) stopAppendOnly();
if (!fUpdate)
{
signalFlushedDb(-1);
/* When diskless RDB loading is used by replicas, it may be configured
@ -1884,6 +1887,7 @@ void readSyncBulkPayload(connection *conn) {
} else {
emptyDb(-1,empty_db_flags,replicationEmptyDbCallback);
}
}
/* Before loading the DB into memory we need to delete the readable
* handler, otherwise it will get called recursively since
@ -1910,6 +1914,7 @@ void readSyncBulkPayload(connection *conn) {
"from socket");
cancelReplicationHandshake(mi);
rioFreeConn(&rdb, NULL);
if (!fUpdate) {
if (g_pserver->repl_diskless_load == REPL_DISKLESS_LOAD_SWAPDB) {
/* Restore the backed up databases. */
disklessLoadRestoreBackups(diskless_load_backup,1,
@ -1919,6 +1924,7 @@ void readSyncBulkPayload(connection *conn) {
* an empty replica. */
emptyDb(-1,empty_db_flags,replicationEmptyDbCallback);
}
}
/* Note that there's no point in restarting the AOF on SYNC
* failure, it'll be restarted when sync succeeds or the replica
@ -1927,6 +1933,7 @@ void readSyncBulkPayload(connection *conn) {
}
stopLoading(1);
if (!fUpdate) {
/* RDB loading succeeded if we reach this point. */
if (g_pserver->repl_diskless_load == REPL_DISKLESS_LOAD_SWAPDB) {
/* Delete the backup databases we created before starting to load
@ -1934,6 +1941,7 @@ void readSyncBulkPayload(connection *conn) {
* data is useless. */
disklessLoadRestoreBackups(diskless_load_backup,0,empty_db_flags);
}
}
/* Verify the end mark is correct. */
if (usemark) {

28
tests/integration/replication-active.tcl
View File

@ -129,3 +129,31 @@ start_server {tags {"active-repl"} overrides {active-replica yes}} {
}
}
}
foreach mdl {no yes} {
foreach sdl {disabled swapdb} {
start_server {tags {"active-repl"} overrides {active-replica yes}} {
set master [srv 0 client]
$master config set repl-diskless-sync $mdl
set master_host [srv 0 host]
set master_port [srv 0 port]
r set masterkey foo
start_server {overrides {active-replica yes}} {
test "Active replication databases are merged, master diskless=$mdl, replica diskless=$sdl" {
r config set repl-diskless-load $sdl
r set slavekey bar
r replicaof $master_host $master_port
wait_for_condition 50 400 {
[string match *state=online* [$master info]]
} else {
fail "Replica never came online"
}
assert_equal bar [r get slavekey]
assert_equal foo [r get masterkey]
}
}
}
}
}