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

syncio.c calls in replication.c fixed for the new millisecond timeout API.

Browse Source
This commit is contained in:
antirez 2012-03-31 11:23:30 +02:00
parent 04d360fdcd
commit 9157549fad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/replication.c
View File

@ -282,7 +282,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
/* If repl_transfer_left == -1 we still have to read the bulk length /* If repl_transfer_left == -1 we still have to read the bulk length
* from the master reply. */ * from the master reply. */
if (server.repl_transfer_left == -1) { if (server.repl_transfer_left == -1) {
if (syncReadLine(fd,buf,1024,server.repl_syncio_timeout) == -1) { if (syncReadLine(fd,buf,1024,server.repl_syncio_timeout*1000) == -1) {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,
"I/O error reading bulk count from MASTER: %s", "I/O error reading bulk count from MASTER: %s",
strerror(errno)); strerror(errno));
@ -405,13 +405,13 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
size_t authlen; size_t authlen;
authlen = snprintf(authcmd,sizeof(authcmd),"AUTH %s\r\n",server.masterauth); authlen = snprintf(authcmd,sizeof(authcmd),"AUTH %s\r\n",server.masterauth);
if (syncWrite(fd,authcmd,authlen,server.repl_syncio_timeout) == -1) { if (syncWrite(fd,authcmd,authlen,server.repl_syncio_timeout*1000) == -1) {
redisLog(REDIS_WARNING,"Unable to AUTH to MASTER: %s", redisLog(REDIS_WARNING,"Unable to AUTH to MASTER: %s",
strerror(errno)); strerror(errno));
goto error; goto error;
} }
/* Read the AUTH result. */ /* Read the AUTH result. */
if (syncReadLine(fd,buf,1024,server.repl_syncio_timeout) == -1) { if (syncReadLine(fd,buf,1024,server.repl_syncio_timeout*1000) == -1) {
redisLog(REDIS_WARNING,"I/O error reading auth result from MASTER: %s", redisLog(REDIS_WARNING,"I/O error reading auth result from MASTER: %s",
strerror(errno)); strerror(errno));
goto error; goto error;
@ -423,7 +423,7 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
} }
/* Issue the SYNC command */ /* Issue the SYNC command */
if (syncWrite(fd,"SYNC \r\n",7,server.repl_syncio_timeout) == -1) { if (syncWrite(fd,"SYNC \r\n",7,server.repl_syncio_timeout*1000) == -1) {
redisLog(REDIS_WARNING,"I/O error writing to MASTER: %s", redisLog(REDIS_WARNING,"I/O error writing to MASTER: %s",
strerror(errno)); strerror(errno));
goto error; goto error;