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

Fix race in sendBulk

Browse Source 
Former-commit-id: 5fd07e08894482e1a55f18ece9c52ff5379b82ec
This commit is contained in:
John Sully 2020-04-15 22:26:00 -04:00
parent bbb08af294
commit 19550c4819
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/replication.cpp
View File

@ -1228,6 +1228,7 @@ void sendBulkToSlave(connection *conn) {
serverAssert(FCorrectThread(replica)); serverAssert(FCorrectThread(replica));
char buf[PROTO_IOBUF_LEN]; char buf[PROTO_IOBUF_LEN];
ssize_t nwritten, buflen; ssize_t nwritten, buflen;
std::unique_lock<fastlock> ul(replica->lock);
/* Before sending the RDB file, we send the preamble as configured by the /* Before sending the RDB file, we send the preamble as configured by the
* replication process. Currently the preamble is just the bulk count of * replication process. Currently the preamble is just the bulk count of
@ -3109,6 +3110,10 @@ void roleCommand(client *c) {
while ((ln = listNext(&li))) while ((ln = listNext(&li)))
{ {
redisMaster *mi = (redisMaster*)listNodeValue(ln); redisMaster *mi = (redisMaster*)listNodeValue(ln);
std::unique_lock<fastlock> lock;
if (mi->master != nullptr)
lock = std::unique_lock<fastlock>(mi->master->lock);
const char *slavestate = NULL; const char *slavestate = NULL;
addReplyArrayLen(c,5); addReplyArrayLen(c,5);
if (g_pserver->fActiveReplica) if (g_pserver->fActiveReplica)
@ -3952,6 +3957,13 @@ struct RemoteMasterState
{ {
uint64_t mvcc = 0; uint64_t mvcc = 0;
client *cFake = nullptr; client *cFake = nullptr;
~RemoteMasterState()
{
aeAcquireLock();
freeClient(cFake);
aeReleaseLock();
}
}; };
static std::unordered_map<std::string, RemoteMasterState> g_mapremote; static std::unordered_map<std::string, RemoteMasterState> g_mapremote;