Don't increment dirty on expireIfNeeded() as natural expires are not considered datab...

[redis.git] / src / replication.c

diff --git a/src/replication.c b/src/replication.c
index 8937582019fe367d5809aeea3065b1476411af1b..8c629006a14b7b02374ef64f8e6adcb72f664846 100644 (file)
--- a/src/replication.c
+++ b/src/replication.c
@@ -138,7 +138,7 @@ int syncRead(int fd, char *ptr, ssize_t size, int timeout) {
     while(size) {
         if (aeWait(fd,AE_READABLE,1000) & AE_READABLE) {
             nread = read(fd,ptr,size);
     while(size) {
         if (aeWait(fd,AE_READABLE,1000) & AE_READABLE) {
             nread = read(fd,ptr,size);

-            if (nread == -1) return -1;
+            if (nread <= 0) return -1;

             ptr += nread;
             size -= nread;
             totread += nread;
             ptr += nread;
             size -= nread;
             totread += nread;


@@ -179,7 +179,7 @@ void syncCommand(redisClient *c) {
     /* Refuse SYNC requests if we are a slave but the link with our master
      * is not ok... */
     if (server.masterhost && server.replstate != REDIS_REPL_CONNECTED) {
     /* Refuse SYNC requests if we are a slave but the link with our master
      * is not ok... */
     if (server.masterhost && server.replstate != REDIS_REPL_CONNECTED) {

-        addReplySds(c,sdsnew("-ERR Can't SYNC while not connected with my master\r\n"));
+        addReplyError(c,"Can't SYNC while not connected with my master");

         return;
     }
 
         return;
     }
 


@@ -188,7 +188,7 @@ void syncCommand(redisClient *c) {
      * buffer registering the differences between the BGSAVE and the current
      * dataset, so that we can copy to other slaves if needed. */
     if (listLength(c->reply) != 0) {
      * buffer registering the differences between the BGSAVE and the current
      * dataset, so that we can copy to other slaves if needed. */
     if (listLength(c->reply) != 0) {

-        addReplySds(c,sdsnew("-ERR SYNC is invalid with pending input\r\n"));
+        addReplyError(c,"SYNC is invalid with pending input");

         return;
     }
 
         return;
     }
 


@@ -226,7 +226,7 @@ void syncCommand(redisClient *c) {
         redisLog(REDIS_NOTICE,"Starting BGSAVE for SYNC");
         if (rdbSaveBackground(server.dbfilename) != REDIS_OK) {
             redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE");
         redisLog(REDIS_NOTICE,"Starting BGSAVE for SYNC");
         if (rdbSaveBackground(server.dbfilename) != REDIS_OK) {
             redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE");

-            addReplySds(c,sdsnew("-ERR Unalbe to perform background save\r\n"));
+            addReplyError(c,"Unable to perform background save");

             return;
         }
         c->replstate = REDIS_REPL_WAIT_BGSAVE_END;
             return;
         }
         c->replstate = REDIS_REPL_WAIT_BGSAVE_END;


@@ -428,9 +428,9 @@ int syncWithMaster(void) {
         int nread, nwritten;
 
         nread = read(fd,buf,(dumpsize < 1024)?dumpsize:1024);
         int nread, nwritten;
 
         nread = read(fd,buf,(dumpsize < 1024)?dumpsize:1024);

-        if (nread == -1) {
+        if (nread <= 0) {

             redisLog(REDIS_WARNING,"I/O error trying to sync with MASTER: %s",
             redisLog(REDIS_WARNING,"I/O error trying to sync with MASTER: %s",

-                strerror(errno));
+                (nread == -1) ? strerror(errno) : "connection lost");

             close(fd);
             close(dfd);
             return REDIS_ERR;
             close(fd);
             close(dfd);
             return REDIS_ERR;