Log time taken to load the DB at startup, in seconds

diff --git a/TODO b/TODO
index 86e9526ec4179f5a93231346fde3d9d92408e0c5..f904821a2e730343ed4317076ab4b495f5092f62 100644 (file)
--- a/TODO
+++ b/TODO
@@ -19,6 +19,7 @@ Virtual Memory sub-TODO:
 * vm-min-age <seconds> option
 * Make sure objects loaded from the VM are specially encoded when possible.
 * Check what happens performance-wise if instead to create threads again and again the same threads are reused forever. Note: this requires a way to disable this clients in the child, but waiting for empty new jobs queue can be enough.
+* Sets of integers are slow to load, for a number of reasons. Fix it. (use slow_sets.rdb file for debugging).
 
 * Hashes (GET/SET/DEL/INCRBY/EXISTS/FIELDS/LEN/MSET/MGET). Special encoding for hashes with < N keys.
 

diff --git a/redis.c b/redis.c
index bc1593198af3bc719e7137e7e71b115beb1ae7f0..36055c4c92425ea6d6af3d1ce91e89ca55dc5829 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -8212,6 +8212,8 @@ static void daemonize(void) {
 }
 
 int main(int argc, char **argv) {
+    time_t start;
+
     initServerConfig();
     if (argc == 2) {
         resetServerSaveParams();
@@ -8228,12 +8230,13 @@ int main(int argc, char **argv) {
 #ifdef __linux__
     linuxOvercommitMemoryWarning();
 #endif
+    start = time(NULL);
     if (server.appendonly) {
         if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
-            redisLog(REDIS_NOTICE,"DB loaded from append only file");
+            redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start);
     } else {
         if (rdbLoad(server.dbfilename) == REDIS_OK)
-            redisLog(REDIS_NOTICE,"DB loaded from disk");
+            redisLog(REDIS_NOTICE,"DB loaded from disk: %ld seconds",time(NULL)-start);
     }
     redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
     aeSetBeforeSleepProc(server.el,beforeSleep);