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

PSYNC2: discard pending transactions from cached master.

Browse Source 
During the review of the fix for #3899, @yangsiran identified an
implementation bug: given that the offset is now relative to the applied
part of the replication log, when we cache a master, the successive
PSYNC2 request will be made in order to *include* the transaction that
was not completely processed. This means that we need to discard any
pending transaction from our replication buffer: it will be re-executed.
This commit is contained in:
antirez 2017-04-19 14:02:52 +02:00
parent 22be435efe
commit 189a12afb4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/replication.c
View File

@ -2120,10 +2120,12 @@ void replicationCacheMaster(client *c) {
unlinkClient(c); unlinkClient(c);
/* Fix the master specific fields: we want to discard to non processed /* Fix the master specific fields: we want to discard to non processed
* query buffers and non processed offsets. */ * query buffers and non processed offsets, including pending
* transactions. */
sdsclear(server.master->querybuf); sdsclear(server.master->querybuf);
sdsclear(server.master->pending_querybuf); sdsclear(server.master->pending_querybuf);
server.master->read_reploff = server.master->reploff; server.master->read_reploff = server.master->reploff;
if (c->flags & CLIENT_MULTI) discardTransaction(c);
/* Save the master. Server.master will be set to null later by /* Save the master. Server.master will be set to null later by
* replicationHandleMasterDisconnection(). */ * replicationHandleMasterDisconnection(). */