fixed a problem in bioOlderJobType() when there are no jobs of the specified type...

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 1d7501f9376edcb462a9f48a4c3a665b2152b212..268398f0f771b110da8058f3ed56406536e42338 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -29,6 +29,7 @@
 
 #include "redis.h"
 #include "slowlog.h"
 
 #include "redis.h"
 #include "slowlog.h"

+#include "bio.h"

 
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>


@@ -575,6 +576,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
      * in objects at every object access, and accuracy is not needed.
      * To access a global var is faster than calling time(NULL) */
     server.unixtime = time(NULL);
      * in objects at every object access, and accuracy is not needed.
      * To access a global var is faster than calling time(NULL) */
     server.unixtime = time(NULL);

+

     /* We have just 22 bits per object for LRU information.
      * So we use an (eventually wrapping) LRU clock with 10 seconds resolution.
      * 2^22 bits with 10 seconds resoluton is more or less 1.5 years.
     /* We have just 22 bits per object for LRU information.
      * So we use an (eventually wrapping) LRU clock with 10 seconds resolution.
      * 2^22 bits with 10 seconds resoluton is more or less 1.5 years.


@@ -685,7 +687,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
              server.auto_aofrewrite_perc &&
              server.appendonly_current_size > server.auto_aofrewrite_min_size)
          {
              server.auto_aofrewrite_perc &&
              server.appendonly_current_size > server.auto_aofrewrite_min_size)
          {

-            int base = server.auto_aofrewrite_base_size ?
+            long long base = server.auto_aofrewrite_base_size ?

                             server.auto_aofrewrite_base_size : 1;
             long long growth = (server.appendonly_current_size*100/base) - 100;
             if (growth >= server.auto_aofrewrite_perc) {
                             server.auto_aofrewrite_base_size : 1;
             long long growth = (server.appendonly_current_size*100/base) - 100;
             if (growth >= server.auto_aofrewrite_perc) {


@@ -965,6 +967,7 @@ void initServer() {
     if (server.cluster_enabled) clusterInit();
     scriptingInit();
     slowlogInit();
     if (server.cluster_enabled) clusterInit();
     scriptingInit();
     slowlogInit();

+    bioInit();

     srand(time(NULL)^getpid());
 }
 
     srand(time(NULL)^getpid());
 }
 


@@ -1022,9 +1025,9 @@ void call(redisClient *c) {
     slowlogPushEntryIfNeeded(c->argv,c->argc,duration);
     c->cmd->calls++;
 
     slowlogPushEntryIfNeeded(c->argv,c->argc,duration);
     c->cmd->calls++;
 

-    if (server.appendonly && dirty)
+    if (server.appendonly && dirty > 0)

         feedAppendOnlyFile(c->cmd,c->db->id,c->argv,c->argc);
         feedAppendOnlyFile(c->cmd,c->db->id,c->argv,c->argc);

-    if ((dirty || c->cmd->flags & REDIS_CMD_FORCE_REPLICATION) &&
+    if ((dirty > 0 || c->cmd->flags & REDIS_CMD_FORCE_REPLICATION) &&

         listLength(server.slaves))
         replicationFeedSlaves(server.slaves,c->db->id,c->argv,c->argc);
     if (listLength(server.monitors))
         listLength(server.slaves))
         replicationFeedSlaves(server.slaves,c->db->id,c->argv,c->argc);
     if (listLength(server.monitors))


@@ -1152,19 +1155,29 @@ int processCommand(redisClient *c) {
 /*================================== Shutdown =============================== */
 
 int prepareForShutdown() {
 /*================================== Shutdown =============================== */
 
 int prepareForShutdown() {

-    redisLog(REDIS_WARNING,"User requested shutdown, saving DB...");
+    redisLog(REDIS_WARNING,"User requested shutdown...");

     /* Kill the saving child if there is a background saving in progress.
        We want to avoid race conditions, for instance our saving child may
        overwrite the synchronous saving did by SHUTDOWN. */
     if (server.bgsavechildpid != -1) {
     /* Kill the saving child if there is a background saving in progress.
        We want to avoid race conditions, for instance our saving child may
        overwrite the synchronous saving did by SHUTDOWN. */
     if (server.bgsavechildpid != -1) {

-        redisLog(REDIS_WARNING,"There is a live saving child. Killing it!");
+        redisLog(REDIS_WARNING,"There is a child saving an .rdb. Killing it!");

         kill(server.bgsavechildpid,SIGKILL);
         rdbRemoveTempFile(server.bgsavechildpid);
     }
     if (server.appendonly) {
         kill(server.bgsavechildpid,SIGKILL);
         rdbRemoveTempFile(server.bgsavechildpid);
     }
     if (server.appendonly) {

+        /* Kill the AOF saving child as the AOF we already have may be longer
+         * but contains the full dataset anyway. */
+        if (server.bgrewritechildpid != -1) {
+            redisLog(REDIS_WARNING,
+                "There is a child rewriting the AOF. Killing it!");
+            kill(server.bgrewritechildpid,SIGKILL);
+        }

         /* Append only file: fsync() the AOF and exit */
         /* Append only file: fsync() the AOF and exit */

+        redisLog(REDIS_NOTICE,"Calling fsync() on the AOF file.");

         aof_fsync(server.appendfd);
         aof_fsync(server.appendfd);

-    } else if (server.saveparamslen > 0) {
+    }
+    if (server.saveparamslen > 0) {
+        redisLog(REDIS_NOTICE,"Saving the final RDB snapshot before exiting.");

         /* Snapshotting. Perform a SYNC SAVE and exit */
         if (rdbSave(server.dbfilename) != REDIS_OK) {
             /* Ooops.. error saving! The best we can do is to continue
         /* Snapshotting. Perform a SYNC SAVE and exit */
         if (rdbSave(server.dbfilename) != REDIS_OK) {
             /* Ooops.. error saving! The best we can do is to continue


@@ -1172,14 +1185,19 @@ int prepareForShutdown() {
              * in the next cron() Redis will be notified that the background
              * saving aborted, handling special stuff like slaves pending for
              * synchronization... */
              * in the next cron() Redis will be notified that the background
              * saving aborted, handling special stuff like slaves pending for
              * synchronization... */

-            redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit");
+            redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit.");

             return REDIS_ERR;
         }
             return REDIS_ERR;
         }

-    } else {
-        redisLog(REDIS_WARNING,"Not saving DB.");

     }
     }

-    if (server.daemonize) unlink(server.pidfile);
-    redisLog(REDIS_WARNING,"Server exit now, bye bye...");
+    if (server.daemonize) {
+        redisLog(REDIS_NOTICE,"Removing the pid file.");
+        unlink(server.pidfile);
+    }
+    /* Close the listening sockets. Apparently this allows faster restarts. */
+    if (server.ipfd != -1) close(server.ipfd);
+    if (server.sofd != -1) close(server.sofd);
+
+    redisLog(REDIS_WARNING,"Redis is now ready to exit, bye bye...");

     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 


@@ -1711,6 +1729,7 @@ void redisAsciiArt(void) {
 int main(int argc, char **argv) {
     long long start;
 
 int main(int argc, char **argv) {
     long long start;
 

+    zmalloc_enable_thread_safeness();

     initServerConfig();
     if (argc == 2) {
         if (strcmp(argv[1], "-v") == 0 ||
     initServerConfig();
     if (argc == 2) {
         if (strcmp(argv[1], "-v") == 0 ||