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

Fix an intermittent crash when replicationCron happens before slavesdb is update

Browse Source 
Former-commit-id: 27c9ae667e515819d5be06722722ed6ff43a3205
This commit is contained in:
John Sully 2019-10-13 12:04:54 -04:00
parent 0a00341a80
commit 6080010db0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/replication.cpp
View File

@ -288,6 +288,8 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
listIter li, liReply; listIter li, liReply;
int j, len; int j, len;
serverAssert(GlobalLocksAcquired()); serverAssert(GlobalLocksAcquired());
if (dictid < 0)
dictid = 0; // this can happen if we send a PING before any real operation
/* If the instance is not a top level master, return ASAP: we'll just proxy /* If the instance is not a top level master, return ASAP: we'll just proxy
* the stream of data we receive from our master instead, in order to * the stream of data we receive from our master instead, in order to
@ -327,7 +329,6 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
cchProto = std::min((int)sizeof(proto), cchProto); cchProto = std::min((int)sizeof(proto), cchProto);
long long master_repl_offset_start = g_pserver->master_repl_offset; long long master_repl_offset_start = g_pserver->master_repl_offset;
serverAssert(dictid >= 0);
char szDbNum[128]; char szDbNum[128];
int cchDbNum = snprintf(szDbNum, sizeof(szDbNum), "$%d\r\n%d\r\n", (dictid/10)+1, dictid); int cchDbNum = snprintf(szDbNum, sizeof(szDbNum), "$%d\r\n%d\r\n", (dictid/10)+1, dictid);