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

Fixed single threaded for real this time, need to add synchronization for multi threaded

Browse Source 
Former-commit-id: 4d858dac1a503f4d518477212ba585069af22574
This commit is contained in:
VivekSainiEQ 2021-05-21 17:05:55 +00:00
parent 7ff2fb716a
commit 4fd76c4791
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/networking.cpp
View File

@ -1676,8 +1676,7 @@ int writeToClient(client *c, int handler_installed) {
std::unique_lock<decltype(c->lock)> lock(c->lock); std::unique_lock<decltype(c->lock)> lock(c->lock);
/* if this is a write to a replica, it's coming straight from the replication backlog */
long long repl_backlog_idx = g_pserver->repl_backlog_idx;
while(clientHasPendingReplies(c)) { while(clientHasPendingReplies(c)) {
if (c->bufpos > 0) { if (c->bufpos > 0) {
@ -1742,6 +1741,9 @@ int writeToClient(client *c, int handler_installed) {
c->transmittedRDB = true; c->transmittedRDB = true;
} }
/* if this is a write to a replica, it's coming straight from the replication backlog */
long long repl_backlog_idx = g_pserver->repl_backlog_idx;
/* For replicas, we don't store all the information in the client buffer /* For replicas, we don't store all the information in the client buffer
* Most of the time (aside from immediately after synchronizing), we read * Most of the time (aside from immediately after synchronizing), we read
* from the replication backlog directly */ * from the replication backlog directly */
@ -1782,7 +1784,7 @@ int writeToClient(client *c, int handler_installed) {
// } // }
if (nwritten == nrequested && g_pserver->repl_backlog_idx == c->repl_curr_idx){ if (nwritten == nrequested && g_pserver->repl_backlog_idx == repl_backlog_idx){
c->repl_curr_idx = -1; /* -1 denotes no more replica writes */ c->repl_curr_idx = -1; /* -1 denotes no more replica writes */
} }
else if (nwritten > 0) else if (nwritten > 0)

5
src/replication.cpp
View File

@ -3059,6 +3059,11 @@ void syncWithMaster(connection *conn) {
if (psync_result == PSYNC_CONTINUE) { if (psync_result == PSYNC_CONTINUE) {
serverLog(LL_NOTICE, "MASTER <-> REPLICA sync: Master accepted a Partial Resynchronization."); serverLog(LL_NOTICE, "MASTER <-> REPLICA sync: Master accepted a Partial Resynchronization.");
/* Reset the bulklen information in case it is lingering from the last connection
* The partial sync will start from the beginning of a command so these should be reset */
mi->master->reqtype = 0;
mi->master->multibulklen = 0;
mi->master->bulklen = -1;
if (cserver.supervised_mode == SUPERVISED_SYSTEMD) { if (cserver.supervised_mode == SUPERVISED_SYSTEMD) {
redisCommunicateSystemd("STATUS=MASTER <-> REPLICA sync: Partial Resynchronization accepted. Ready to accept connections.\n"); redisCommunicateSystemd("STATUS=MASTER <-> REPLICA sync: Partial Resynchronization accepted. Ready to accept connections.\n");
redisCommunicateSystemd("READY=1\n"); redisCommunicateSystemd("READY=1\n");