caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replication: don't even queue replies to master commands.

Browse Source 
When master send commands, there is no need for the slave to reply.
Redis used to queue the reply in the output buffer and discard the reply
later, this is a waste of work and it is not clear why it was this way
(I sincerely don't remember).

This commit changes it in order to don't queue the reply at all.

All tests passing.
This commit is contained in:
antirez 2013-05-24 18:58:57 +02:00
parent c853239a5e
commit dd937030f0
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/networking.c
View File

@ -116,15 +116,15 @@ redisClient *createClient(int fd) {
* returns REDIS_OK, and make sure to install the write handler in our event * returns REDIS_OK, and make sure to install the write handler in our event
* loop so that when the socket is writable new data gets written. * loop so that when the socket is writable new data gets written.
* *
* If the client should not receive new data, because it is a fake client * If the client should not receive new data, because it is a fake client,
* or a slave not yet online, or because the setup of the write handler * a master, a slave not yet online, or because the setup of the write handler
* failed, the function returns REDIS_ERR. * failed, the function returns REDIS_ERR.
* *
* Typically gets called every time a reply is built, before adding more * Typically gets called every time a reply is built, before adding more
* data to the clients output buffers. If the function returns REDIS_ERR no * data to the clients output buffers. If the function returns REDIS_ERR no
* data should be appended to the output buffers. */ * data should be appended to the output buffers. */
int prepareClientToWrite(redisClient *c) { int prepareClientToWrite(redisClient *c) {
if (c->flags & REDIS_LUA_CLIENT) return REDIS_OK; if (c->flags & (REDIS_LUA_CLIENT|REDIS_MASTER)) return REDIS_OK;
if (c->fd <= 0) return REDIS_ERR; /* Fake client */ if (c->fd <= 0) return REDIS_ERR; /* Fake client */
if (c->bufpos == 0 && listLength(c->reply) == 0 && if (c->bufpos == 0 && listLength(c->reply) == 0 &&
(c->replstate == REDIS_REPL_NONE || (c->replstate == REDIS_REPL_NONE ||
@ -739,13 +739,8 @@ void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {
while(c->bufpos > 0 || listLength(c->reply)) { while(c->bufpos > 0 || listLength(c->reply)) {
if (c->bufpos > 0) { if (c->bufpos > 0) {
if (c->flags & REDIS_MASTER) { nwritten = write(fd,c->buf+c->sentlen,c->bufpos-c->sentlen);
/* Don't reply to a master */ if (nwritten <= 0) break;
nwritten = c->bufpos - c->sentlen;
} else {
nwritten = write(fd,c->buf+c->sentlen,c->bufpos-c->sentlen);
if (nwritten <= 0) break;
}
c->sentlen += nwritten; c->sentlen += nwritten;
totwritten += nwritten; totwritten += nwritten;
@ -765,13 +760,8 @@ void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {
continue; continue;
} }
if (c->flags & REDIS_MASTER) { nwritten = write(fd, ((char*)o->ptr)+c->sentlen,objlen-c->sentlen);
/* Don't reply to a master */ if (nwritten <= 0) break;
nwritten = objlen - c->sentlen;
} else {
nwritten = write(fd, ((char*)o->ptr)+c->sentlen,objlen-c->sentlen);
if (nwritten <= 0) break;
}
c->sentlen += nwritten; c->sentlen += nwritten;
totwritten += nwritten; totwritten += nwritten;