fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

non blocking slave replication is now more non blocking than the first implementation...

Browse Source
This commit is contained in:
antirez 2010-11-04 18:09:35 +01:00
parent 62ec599c36
commit 26b3366993
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/replication.c
View File

@ -306,12 +306,41 @@ void replicationAbortSyncTransfer(void) {
/* Asynchronously read the SYNC payload we receive from a master */ /* Asynchronously read the SYNC payload we receive from a master */
void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
unsigned char buf[4096]; char buf[4096];
ssize_t nread, readlen; ssize_t nread, readlen;
REDIS_NOTUSED(el); REDIS_NOTUSED(el);
REDIS_NOTUSED(privdata); REDIS_NOTUSED(privdata);
REDIS_NOTUSED(mask); REDIS_NOTUSED(mask);
/* If repl_transfer_left == -1 we still have to read the bulk length
* from the master reply. */
if (server.repl_transfer_left == -1) {
if (syncReadLine(fd,buf,1024,3600) == -1) {
redisLog(REDIS_WARNING,
"I/O error reading bulk count from MASTER: %s",
strerror(errno));
replicationAbortSyncTransfer();
return;
}
if (buf[0] == '-') {
redisLog(REDIS_WARNING,
"MASTER aborted replication with an error: %s",
buf+1);
replicationAbortSyncTransfer();
return;
} else if (buf[0] != '$') {
redisLog(REDIS_WARNING,"Bad protocol from MASTER, the first byte is not '$', are you sure the host and port are right?");
replicationAbortSyncTransfer();
return;
}
server.repl_transfer_left = strtol(buf+1,NULL,10);
redisLog(REDIS_NOTICE,
"MASTER <-> SLAVE sync: receiving %ld bytes from master",
server.repl_transfer_left);
return;
}
/* Read bulk data */
readlen = (server.repl_transfer_left < (signed)sizeof(buf)) ? readlen = (server.repl_transfer_left < (signed)sizeof(buf)) ?
server.repl_transfer_left : (signed)sizeof(buf); server.repl_transfer_left : (signed)sizeof(buf);
nread = read(fd,buf,readlen); nread = read(fd,buf,readlen);
@ -349,12 +378,12 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
server.master->flags |= REDIS_MASTER; server.master->flags |= REDIS_MASTER;
server.master->authenticated = 1; server.master->authenticated = 1;
server.replstate = REDIS_REPL_CONNECTED; server.replstate = REDIS_REPL_CONNECTED;
redisLog(REDIS_NOTICE, "MASTER <-> SLAVE sync: Finished with success");
} }
} }
int syncWithMaster(void) { int syncWithMaster(void) {
char buf[1024], tmpfile[256], authcmd[1024]; char buf[1024], tmpfile[256], authcmd[1024];
off_t dumpsize;
int fd = anetTcpConnect(NULL,server.masterhost,server.masterport); int fd = anetTcpConnect(NULL,server.masterhost,server.masterport);
int dfd, maxtries = 5; int dfd, maxtries = 5;
@ -394,26 +423,8 @@ int syncWithMaster(void) {
strerror(errno)); strerror(errno));
return REDIS_ERR; return REDIS_ERR;
} }
/* Read the bulk write count */
if (syncReadLine(fd,buf,1024,3600) == -1) { /* Prepare a suitable temp file for bulk transfer */
close(fd);
redisLog(REDIS_WARNING,"I/O error reading bulk count from MASTER: %s",
strerror(errno));
return REDIS_ERR;
}
if (buf[0] == '-') {
close(fd);
redisLog(REDIS_WARNING,"MASTER aborted replication with an error: %s",
buf+1);
return REDIS_ERR;
} else if (buf[0] != '$') {
close(fd);
redisLog(REDIS_WARNING,"Bad protocol from MASTER, the first byte is not '$', are you sure the host and port are right?");
return REDIS_ERR;
}
dumpsize = strtol(buf+1,NULL,10);
redisLog(REDIS_NOTICE,"Receiving %ld bytes data dump from MASTER",dumpsize);
/* Read the bulk write data on a temp file */
while(maxtries--) { while(maxtries--) {
snprintf(tmpfile,256, snprintf(tmpfile,256,
"temp-%d.%ld.rdb",(int)time(NULL),(long int)getpid()); "temp-%d.%ld.rdb",(int)time(NULL),(long int)getpid());
@ -436,7 +447,7 @@ int syncWithMaster(void) {
return REDIS_ERR; return REDIS_ERR;
} }
server.replstate = REDIS_REPL_TRANSFER; server.replstate = REDIS_REPL_TRANSFER;
server.repl_transfer_left = dumpsize; server.repl_transfer_left = -1;
server.repl_transfer_s = fd; server.repl_transfer_s = fd;
server.repl_transfer_fd = dfd; server.repl_transfer_fd = dfd;
server.repl_transfer_lastio = time(NULL); server.repl_transfer_lastio = time(NULL);
@ -487,7 +498,7 @@ void replicationCron(void) {
if (server.replstate == REDIS_REPL_CONNECT) { if (server.replstate == REDIS_REPL_CONNECT) {
redisLog(REDIS_NOTICE,"Connecting to MASTER..."); redisLog(REDIS_NOTICE,"Connecting to MASTER...");
if (syncWithMaster() == REDIS_OK) { if (syncWithMaster() == REDIS_OK) {
redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync succeeded"); redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync started: SYNC sent");
if (server.appendonly) rewriteAppendOnlyFileBackground(); if (server.appendonly) rewriteAppendOnlyFileBackground();
} }
} }