Ping the slave using the standard protocol instead of the inline one.

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index bb9121c88f5e4b793339e08a07ae31ea676ebf29..3a10e0cec012d9425b666a89d8201b251d43bd68 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -253,7 +253,7 @@ int rdbSaveRawString(rio *rdb, unsigned char *s, size_t len) {
 
     /* Try LZF compression - under 20 bytes it's unable to compress even
      * aaaaaaaaaaaaaaaaaa so skip it */
 
     /* Try LZF compression - under 20 bytes it's unable to compress even
      * aaaaaaaaaaaaaaaaaa so skip it */

-    if (server.rdbcompression && len > 20) {
+    if (server.rdb_compression && len > 20) {

         n = rdbSaveLzfStringObject(rdb,s,len);
         if (n == -1) return -1;
         if (n > 0) return n;
         n = rdbSaveLzfStringObject(rdb,s,len);
         if (n == -1) return -1;
         if (n > 0) return n;


@@ -597,7 +597,7 @@ int rdbSave(char *filename) {
     dictEntry *de;
     char tmpfile[256];
     int j;
     dictEntry *de;
     char tmpfile[256];
     int j;

-    time_t now = mstime();
+    long long now = mstime();

     FILE *fp;
     rio rdb;
 
     FILE *fp;
     rio rdb;
 


@@ -670,7 +670,7 @@ int rdbSaveBackground(char *filename) {
     pid_t childpid;
     long long start;
 
     pid_t childpid;
     long long start;
 

-    if (server.bgsavechildpid != -1) return REDIS_ERR;
+    if (server.rdb_child_pid != -1) return REDIS_ERR;

 
     server.dirty_before_bgsave = server.dirty;
 
 
     server.dirty_before_bgsave = server.dirty;
 


@@ -692,7 +692,7 @@ int rdbSaveBackground(char *filename) {
             return REDIS_ERR;
         }
         redisLog(REDIS_NOTICE,"Background saving started by pid %d",childpid);
             return REDIS_ERR;
         }
         redisLog(REDIS_NOTICE,"Background saving started by pid %d",childpid);

-        server.bgsavechildpid = childpid;
+        server.rdb_child_pid = childpid;

         updateDictResizePolicy();
         return REDIS_OK;
     }
         updateDictResizePolicy();
         return REDIS_OK;
     }


@@ -997,7 +997,7 @@ int rdbLoad(char *filename) {
             if ((expiretime = rdbLoadTime(&rdb)) == -1) goto eoferr;
             /* We read the time so we need to read the object type again. */
             if ((type = rdbLoadType(&rdb)) == -1) goto eoferr;
             if ((expiretime = rdbLoadTime(&rdb)) == -1) goto eoferr;
             /* We read the time so we need to read the object type again. */
             if ((type = rdbLoadType(&rdb)) == -1) goto eoferr;

-            /* the EXPIREITME opcode specifies time in seconds, so convert
+            /* the EXPIRETIME opcode specifies time in seconds, so convert

              * into milliesconds. */
             expiretime *= 1000;
         } else if (type == REDIS_RDB_OPCODE_EXPIRETIME_MS) {
              * into milliesconds. */
             expiretime *= 1000;
         } else if (type == REDIS_RDB_OPCODE_EXPIRETIME_MS) {


@@ -1026,8 +1026,12 @@ int rdbLoad(char *filename) {
         if ((key = rdbLoadStringObject(&rdb)) == NULL) goto eoferr;
         /* Read value */
         if ((val = rdbLoadObject(type,&rdb)) == NULL) goto eoferr;
         if ((key = rdbLoadStringObject(&rdb)) == NULL) goto eoferr;
         /* Read value */
         if ((val = rdbLoadObject(type,&rdb)) == NULL) goto eoferr;

-        /* Check if the key already expired */
-        if (expiretime != -1 && expiretime < now) {
+        /* Check if the key already expired. This function is used when loading
+         * an RDB file from disk, either at startup, or when an RDB was
+         * received from the master. In the latter case, the master is
+         * responsible for key expiry. If we would expire keys here, the
+         * snapshot taken by the master may not be reflected on the slave. */
+        if (server.masterhost == NULL && expiretime != -1 && expiretime < now) {

             decrRefCount(key);
             decrRefCount(val);
             continue;
             decrRefCount(key);
             decrRefCount(val);
             continue;


@@ -1062,20 +1066,20 @@ void backgroundSaveDoneHandler(int exitcode, int bysignal) {
     } else {
         redisLog(REDIS_WARNING,
             "Background saving terminated by signal %d", bysignal);
     } else {
         redisLog(REDIS_WARNING,
             "Background saving terminated by signal %d", bysignal);

-        rdbRemoveTempFile(server.bgsavechildpid);
+        rdbRemoveTempFile(server.rdb_child_pid);

     }
     }

-    server.bgsavechildpid = -1;
+    server.rdb_child_pid = -1;

     /* Possibly there are slaves waiting for a BGSAVE in order to be served
      * (the first stage of SYNC is a bulk transfer of dump.rdb) */
     updateSlavesWaitingBgsave(exitcode == 0 ? REDIS_OK : REDIS_ERR);
 }
 
 void saveCommand(redisClient *c) {
     /* Possibly there are slaves waiting for a BGSAVE in order to be served
      * (the first stage of SYNC is a bulk transfer of dump.rdb) */
     updateSlavesWaitingBgsave(exitcode == 0 ? REDIS_OK : REDIS_ERR);
 }
 
 void saveCommand(redisClient *c) {

-    if (server.bgsavechildpid != -1) {
+    if (server.rdb_child_pid != -1) {

         addReplyError(c,"Background save already in progress");
         return;
     }
         addReplyError(c,"Background save already in progress");
         return;
     }

-    if (rdbSave(server.dbfilename) == REDIS_OK) {
+    if (rdbSave(server.rdb_filename) == REDIS_OK) {

         addReply(c,shared.ok);
     } else {
         addReply(c,shared.err);
         addReply(c,shared.ok);
     } else {
         addReply(c,shared.err);


@@ -1083,11 +1087,11 @@ void saveCommand(redisClient *c) {
 }
 
 void bgsaveCommand(redisClient *c) {
 }
 
 void bgsaveCommand(redisClient *c) {

-    if (server.bgsavechildpid != -1) {
+    if (server.rdb_child_pid != -1) {

         addReplyError(c,"Background save already in progress");
         addReplyError(c,"Background save already in progress");

-    } else if (server.bgrewritechildpid != -1) {
+    } else if (server.aof_child_pid != -1) {

         addReplyError(c,"Can't BGSAVE while AOF log rewriting is in progress");
         addReplyError(c,"Can't BGSAVE while AOF log rewriting is in progress");

-    } else if (rdbSaveBackground(server.dbfilename) == REDIS_OK) {
+    } else if (rdbSaveBackground(server.rdb_filename) == REDIS_OK) {

         addReplyStatus(c,"Background saving started");
     } else {
         addReply(c,shared.err);
         addReplyStatus(c,"Background saving started");
     } else {
         addReply(c,shared.err);