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

remove async write from fast sync repl buffer and fix some bugs

Browse Source 
Former-commit-id: 6c45706f75d8322281296d9c73a3fac4f7f383a1
This commit is contained in:
malavan 2021-11-24 21:59:01 +00:00
parent ef9c1bd074
commit 2ae7247ae7
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/replication.cpp
View File

@ -975,14 +975,7 @@ public:
aeAcquireLock(); aeAcquireLock();
} }
if (ireplica == replicas.size()-1 && replica->replyAsync == nullptr) { addReplyProto(replica, reply->buf(), reply->used);
if (prepareClientToWrite(replica) == C_OK) {
replica->replyAsync = reply;
reply = nullptr;
}
} else {
addReplyProto(replica, reply->buf(), reply->size);
}
} }
ProcessPendingAsyncWrites(); ProcessPendingAsyncWrites();
replicas.erase(std::remove_if(replicas.begin(), replicas.end(), [](const client *c)->bool{ return c->flags.load(std::memory_order_relaxed) & CLIENT_CLOSE_ASAP;}), replicas.end()); replicas.erase(std::remove_if(replicas.begin(), replicas.end(), [](const client *c)->bool{ return c->flags.load(std::memory_order_relaxed) & CLIENT_CLOSE_ASAP;}), replicas.end());
@ -1089,7 +1082,7 @@ int rdbSaveSnapshotForReplication(struct rdbSaveInfo *rsi) {
spreplBuf->addLong(rsi->repl_stream_db); spreplBuf->addLong(rsi->repl_stream_db);
spreplBuf->addArrayLen(2); spreplBuf->addArrayLen(2);
spreplBuf->addString("repl-id", 7); spreplBuf->addString("repl-id", 7);
spreplBuf->addString(rsi->repl_id, CONFIG_RUN_ID_SIZE+1); spreplBuf->addString(rsi->repl_id, CONFIG_RUN_ID_SIZE);
spreplBuf->addArrayLen(2); spreplBuf->addArrayLen(2);
spreplBuf->addString("repl-offset", 11); spreplBuf->addString("repl-offset", 11);
spreplBuf->addLong(rsi->master_repl_offset); spreplBuf->addLong(rsi->master_repl_offset);