X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/13732168a50d86a31a7bf01dad8038e316120afb..HEAD:/src/replication.c diff --git a/src/replication.c b/src/replication.c index 543477b6..720cd4c1 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1,8 +1,40 @@ +/* Asynchronous replication implementation. + * + * Copyright (c) 2009-2012, Salvatore Sanfilippo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Redis nor the names of its contributors may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + #include "redis.h" #include #include #include +#include #include /* ---------------------------------- MASTER -------------------------------- */ @@ -53,10 +85,12 @@ void replicationFeedMonitors(redisClient *c, list *monitors, int dictid, robj ** gettimeofday(&tv,NULL); cmdrepr = sdscatprintf(cmdrepr,"%ld.%06ld ",(long)tv.tv_sec,(long)tv.tv_usec); if (c->flags & REDIS_LUA_CLIENT) { - cmdrepr = sdscatprintf(cmdrepr,"[%d lua] ", dictid); + cmdrepr = sdscatprintf(cmdrepr,"[%d lua] ",dictid); + } else if (c->flags & REDIS_UNIX_SOCKET) { + cmdrepr = sdscatprintf(cmdrepr,"[%d unix:%s] ",dictid,server.unixsocket); } else { anetPeerToString(c->fd,ip,&port); - cmdrepr = sdscatprintf(cmdrepr,"[%d %s:%d] ", dictid,ip,port); + cmdrepr = sdscatprintf(cmdrepr,"[%d %s:%d] ",dictid,ip,port); } for (j = 0; j < argc; j++) { @@ -483,6 +517,8 @@ char *sendSynchronousCommand(int fd, ...) { void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) { char tmpfile[256], *err; int dfd, maxtries = 5; + int sockerr = 0; + socklen_t errlen = sizeof(sockerr); REDIS_NOTUSED(el); REDIS_NOTUSED(privdata); REDIS_NOTUSED(mask); @@ -494,11 +530,62 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) { return; } - redisLog(REDIS_NOTICE,"Non blocking connect for SYNC fired the event."); - /* This event should only be triggered once since it is used to have a - * non-blocking connect(2) to the master. It has been triggered when this - * function is called, so we can delete it. */ - aeDeleteFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE); + /* Check for errors in the socket. */ + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &sockerr, &errlen) == -1) + sockerr = errno; + if (sockerr) { + aeDeleteFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE); + redisLog(REDIS_WARNING,"Error condition on socket for SYNC: %s", + strerror(sockerr)); + goto error; + } + + /* If we were connecting, it's time to send a non blocking PING, we want to + * make sure the master is able to reply before going into the actual + * replication process where we have long timeouts in the order of + * seconds (in the meantime the slave would block). */ + if (server.repl_state == REDIS_REPL_CONNECTING) { + redisLog(REDIS_NOTICE,"Non blocking connect for SYNC fired the event."); + /* Delete the writable event so that the readable event remains + * registered and we can wait for the PONG reply. */ + aeDeleteFileEvent(server.el,fd,AE_WRITABLE); + server.repl_state = REDIS_REPL_RECEIVE_PONG; + /* Send the PING, don't check for errors at all, we have the timeout + * that will take care about this. */ + syncWrite(fd,"PING\r\n",6,100); + return; + } + + /* Receive the PONG command. */ + if (server.repl_state == REDIS_REPL_RECEIVE_PONG) { + char buf[1024]; + + /* Delete the readable event, we no longer need it now that there is + * the PING reply to read. */ + aeDeleteFileEvent(server.el,fd,AE_READABLE); + + /* Read the reply with explicit timeout. */ + buf[0] = '\0'; + if (syncReadLine(fd,buf,sizeof(buf), + server.repl_syncio_timeout*1000) == -1) + { + redisLog(REDIS_WARNING, + "I/O error reading PING reply from master: %s", + strerror(errno)); + goto error; + } + + /* We don't care about the reply, it can be +PONG or an error since + * the server requires AUTH. As long as it replies correctly, it's + * fine from our point of view. */ + if (buf[0] != '-' && buf[0] != '+') { + redisLog(REDIS_WARNING,"Unexpected reply to PING from master."); + goto error; + } else { + redisLog(REDIS_NOTICE, + "Master replied to PING, replication can continue..."); + } + } /* AUTH with the master if required. */ if(server.masterauth) { @@ -563,8 +650,9 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) { return; error: - server.repl_state = REDIS_REPL_CONNECT; close(fd); + server.repl_transfer_s = -1; + server.repl_state = REDIS_REPL_CONNECT; return; } @@ -597,7 +685,8 @@ int connectWithMaster(void) { void undoConnectWithMaster(void) { int fd = server.repl_transfer_s; - redisAssert(server.repl_state == REDIS_REPL_CONNECTING); + redisAssert(server.repl_state == REDIS_REPL_CONNECTING || + server.repl_state == REDIS_REPL_RECEIVE_PONG); aeDeleteFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE); close(fd); server.repl_transfer_s = -1; @@ -613,7 +702,8 @@ void slaveofCommand(redisClient *c) { if (server.master) freeClient(server.master); if (server.repl_state == REDIS_REPL_TRANSFER) replicationAbortSyncTransfer(); - else if (server.repl_state == REDIS_REPL_CONNECTING) + else if (server.repl_state == REDIS_REPL_CONNECTING || + server.repl_state == REDIS_REPL_RECEIVE_PONG) undoConnectWithMaster(); server.repl_state = REDIS_REPL_NONE; redisLog(REDIS_NOTICE,"MASTER MODE enabled (user request)"); @@ -651,7 +741,9 @@ void slaveofCommand(redisClient *c) { void replicationCron(void) { /* Non blocking connection timeout? */ - if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTING && + if (server.masterhost && + (server.repl_state == REDIS_REPL_CONNECTING || + server.repl_state == REDIS_REPL_RECEIVE_PONG) && (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout) { redisLog(REDIS_WARNING,"Timeout connecting to the MASTER..."); @@ -662,7 +754,7 @@ void replicationCron(void) { if (server.masterhost && server.repl_state == REDIS_REPL_TRANSFER && (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout) { - redisLog(REDIS_WARNING,"Timeout receiving bulk data from MASTER..."); + redisLog(REDIS_WARNING,"Timeout receiving bulk data from MASTER... If the problem persists try to set the 'repl-timeout' parameter in redis.conf to a larger value."); replicationAbortSyncTransfer(); } @@ -686,7 +778,7 @@ void replicationCron(void) { * So slaves can implement an explicit timeout to masters, and will * be able to detect a link disconnection even if the TCP connection * will not actually go down. */ - if (!(server.cronloops % (server.repl_ping_slave_period*10))) { + if (!(server.cronloops % (server.repl_ping_slave_period * REDIS_HZ))) { listIter li; listNode *ln;