Non-blocking connect with master

diff --git a/src/redis.h b/src/redis.h
index 5934b6a6f111203b6b98fd596e7e345384c95004..d6b99cea196b59df6802cdd7487933633de785b1 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -153,10 +153,11 @@
 #define REDIS_REQ_MULTIBULK 2
 
 /* Slave replication state - slave side */
 #define REDIS_REQ_MULTIBULK 2
 
 /* Slave replication state - slave side */

-#define REDIS_REPL_NONE 0   /* No active replication */
-#define REDIS_REPL_CONNECT 1    /* Must connect to master */
-#define REDIS_REPL_TRANSFER 2    /* Receiving .rdb from master */
-#define REDIS_REPL_CONNECTED 3  /* Connected to master */
+#define REDIS_REPL_NONE 0 /* No active replication */
+#define REDIS_REPL_CONNECT 1 /* Must connect to master */
+#define REDIS_REPL_TRANSFER 2 /* Receiving .rdb from master */
+#define REDIS_REPL_CONNECTED 3 /* Connected to master */
+#define REDIS_REPL_CONNECTING 4 /* Connecting to master */

 
 /* Slave replication state - from the point of view of master
  * Note that in SEND_BULK and ONLINE state the slave receives new updates
 
 /* Slave replication state - from the point of view of master
  * Note that in SEND_BULK and ONLINE state the slave receives new updates


@@ -888,7 +889,6 @@ int fwriteBulkCount(FILE *fp, char prefix, int count);
 /* Replication */
 void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc);
 void replicationFeedMonitors(list *monitors, int dictid, robj **argv, int argc);
 /* Replication */
 void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc);
 void replicationFeedMonitors(list *monitors, int dictid, robj **argv, int argc);

-int syncWithMaster(void);

 void updateSlavesWaitingBgsave(int bgsaveerr);
 void replicationCron(void);
 
 void updateSlavesWaitingBgsave(int bgsaveerr);
 void replicationCron(void);
 

diff --git a/src/replication.c b/src/replication.c
index b0fa7055672816a5289b04c8001648e3f191c209..c3ddd2d3d7cb0eea7307edf0a535c7af5834f2d5 100644 (file)
--- a/src/replication.c
+++ b/src/replication.c
@@ -393,46 +393,44 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
     }
 }
 
     }
 }
 

-int syncWithMaster(void) {
-    char buf[1024], tmpfile[256], authcmd[1024];
-    int fd = anetTcpConnect(NULL,server.masterhost,server.masterport);
+void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
+    char buf[1024], tmpfile[256];

     int dfd, maxtries = 5;
     int dfd, maxtries = 5;

+    REDIS_NOTUSED(el);
+    REDIS_NOTUSED(privdata);
+    REDIS_NOTUSED(mask);

 
 

-    if (fd == -1) {
-        redisLog(REDIS_WARNING,"Unable to connect to MASTER: %s",
-            strerror(errno));
-        return REDIS_ERR;
-    }
+    /* Remove this event before anything else. */
+    aeDeleteFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE);

 
     /* AUTH with the master if required. */
     if(server.masterauth) {
 
     /* AUTH with the master if required. */
     if(server.masterauth) {

-       snprintf(authcmd, 1024, "AUTH %s\r\n", server.masterauth);
-       if (syncWrite(fd, authcmd, strlen(server.masterauth)+7, 5) == -1) {
-            close(fd);
+        char authcmd[1024];
+        size_t authlen;
+
+        authlen = snprintf(authcmd,sizeof(authcmd),"AUTH %s\r\n",server.masterauth);
+        if (syncWrite(fd,authcmd,authlen,5) == -1) {

             redisLog(REDIS_WARNING,"Unable to AUTH to MASTER: %s",
                 strerror(errno));
             redisLog(REDIS_WARNING,"Unable to AUTH to MASTER: %s",
                 strerror(errno));

-            return REDIS_ERR;
-       }
+            goto error;
+        }

         /* Read the AUTH result.  */
         if (syncReadLine(fd,buf,1024,3600) == -1) {
         /* Read the AUTH result.  */
         if (syncReadLine(fd,buf,1024,3600) == -1) {

-            close(fd);

             redisLog(REDIS_WARNING,"I/O error reading auth result from MASTER: %s",
                 strerror(errno));
             redisLog(REDIS_WARNING,"I/O error reading auth result from MASTER: %s",
                 strerror(errno));

-            return REDIS_ERR;
+            goto error;

         }
         if (buf[0] != '+') {
         }
         if (buf[0] != '+') {

-            close(fd);

             redisLog(REDIS_WARNING,"Cannot AUTH to MASTER, is the masterauth password correct?");
             redisLog(REDIS_WARNING,"Cannot AUTH to MASTER, is the masterauth password correct?");

-            return REDIS_ERR;
+            goto error;

         }
     }
 
     /* Issue the SYNC command */
     if (syncWrite(fd,"SYNC \r\n",7,5) == -1) {
         }
     }
 
     /* Issue the SYNC command */
     if (syncWrite(fd,"SYNC \r\n",7,5) == -1) {

-        close(fd);

         redisLog(REDIS_WARNING,"I/O error writing to MASTER: %s",
             strerror(errno));
         redisLog(REDIS_WARNING,"I/O error writing to MASTER: %s",
             strerror(errno));

-        return REDIS_ERR;
+        goto error;

     }
 
     /* Prepare a suitable temp file for bulk transfer */
     }
 
     /* Prepare a suitable temp file for bulk transfer */


@@ -444,25 +442,51 @@ int syncWithMaster(void) {
         sleep(1);
     }
     if (dfd == -1) {
         sleep(1);
     }
     if (dfd == -1) {

-        close(fd);

         redisLog(REDIS_WARNING,"Opening the temp file needed for MASTER <-> SLAVE synchronization: %s",strerror(errno));
         redisLog(REDIS_WARNING,"Opening the temp file needed for MASTER <-> SLAVE synchronization: %s",strerror(errno));

-        return REDIS_ERR;
+        goto error;

     }
 
     /* Setup the non blocking download of the bulk file. */
     }
 
     /* Setup the non blocking download of the bulk file. */

-    if (aeCreateFileEvent(server.el, fd, AE_READABLE, readSyncBulkPayload, NULL)
+    if (aeCreateFileEvent(server.el,fd, AE_READABLE,readSyncBulkPayload,NULL)

             == AE_ERR)
     {
             == AE_ERR)
     {

-        close(fd);

         redisLog(REDIS_WARNING,"Can't create readable event for SYNC");
         redisLog(REDIS_WARNING,"Can't create readable event for SYNC");

-        return REDIS_ERR;
+        goto error;

     }
     }

+

     server.replstate = REDIS_REPL_TRANSFER;
     server.repl_transfer_left = -1;
     server.replstate = REDIS_REPL_TRANSFER;
     server.repl_transfer_left = -1;

-    server.repl_transfer_s = fd;

     server.repl_transfer_fd = dfd;
     server.repl_transfer_lastio = time(NULL);
     server.repl_transfer_tmpfile = zstrdup(tmpfile);
     server.repl_transfer_fd = dfd;
     server.repl_transfer_lastio = time(NULL);
     server.repl_transfer_tmpfile = zstrdup(tmpfile);

+    return;
+
+error:
+    server.replstate = REDIS_REPL_CONNECT;
+    close(fd);
+    return;
+}
+
+int connectWithMaster(void) {
+    int fd;
+
+    fd = anetTcpNonBlockConnect(NULL,server.masterhost,server.masterport);
+    if (fd == -1) {
+        redisLog(REDIS_WARNING,"Unable to connect to MASTER: %s",
+            strerror(errno));
+        return REDIS_ERR;
+    }
+
+    if (aeCreateFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE,
+            syncWithMaster,NULL) == AE_ERR)
+    {
+        close(fd);
+        redisLog(REDIS_WARNING,"Can't create readable event for SYNC");
+        return REDIS_ERR;
+    }
+
+    server.repl_transfer_s = fd;
+    server.replstate = REDIS_REPL_CONNECTING;

     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 


@@ -517,8 +541,8 @@ void replicationCron(void) {
     /* Check if we should connect to a MASTER */
     if (server.replstate == REDIS_REPL_CONNECT) {
         redisLog(REDIS_NOTICE,"Connecting to MASTER...");
     /* Check if we should connect to a MASTER */
     if (server.replstate == REDIS_REPL_CONNECT) {
         redisLog(REDIS_NOTICE,"Connecting to MASTER...");

-        if (syncWithMaster() == REDIS_OK) {
-            redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync started: SYNC sent");
+        if (connectWithMaster() == REDIS_OK) {
+            redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync started");

             if (server.appendonly) rewriteAppendOnlyFileBackground();
         }
     }
             if (server.appendonly) rewriteAppendOnlyFileBackground();
         }
     }