a new default redis.conf

diff --git a/redis.c b/redis.c
index 178f9c9865b67fb443eef825b14f053f8082ed00..d80a5d631cbf5ec4d5650cc0c1d6ea131b044c0a 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -6955,6 +6955,9 @@ static robj *vmGenericLoadObject(robj *key, int preview) {
         redisLog(REDIS_DEBUG, "VM: object %s loaded from disk",
             (unsigned char*) key->ptr);
         server.vm_stats_swapped_objects--;
         redisLog(REDIS_DEBUG, "VM: object %s loaded from disk",
             (unsigned char*) key->ptr);
         server.vm_stats_swapped_objects--;

+    } else {
+        redisLog(REDIS_DEBUG, "VM: object %s previewed from disk",
+            (unsigned char*) key->ptr);

     }
     server.vm_stats_swapins++;
     return val;
     }
     server.vm_stats_swapins++;
     return val;

diff --git a/redis.conf b/redis.conf
index 669b2d94f0dd3ff8fb67db4de4237e364dc50e17..6f91e3540134fd73b17faecc789fee996e9ce9fd 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -22,9 +22,10 @@ timeout 300
 # Set server verbosity to 'debug'
 # it can be one of:
 # debug (a lot of information, useful for development/testing)
 # Set server verbosity to 'debug'
 # it can be one of:
 # debug (a lot of information, useful for development/testing)

+# verbose (many rarely useful info, but not a mess like the debug level)

 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)

-loglevel debug
+loglevel verbose

 
 # Specify the log file name. Also 'stdout' can be used to force
 # the demon to log on the standard output. Note that if you use standard
 
 # Specify the log file name. Also 'stdout' can be used to force
 # the demon to log on the standard output. Note that if you use standard


@@ -52,9 +53,9 @@ databases 16
 #
 #   Note: you can disable saving at all commenting all the "save" lines.
 
 #
 #   Note: you can disable saving at all commenting all the "save" lines.
 

-#save 900 1
-#save 300 10
-#save 60 10000
+save 900 1
+save 300 10
+save 60 10000

 
 # Compress string objects using LZF when dump .rdb databases?
 # For default that's set to 'yes' as it's almost always a win.
 
 # Compress string objects using LZF when dump .rdb databases?
 # For default that's set to 'yes' as it's almost always a win.


@@ -177,13 +178,17 @@ appendfsync always
 #
 # To enable VM just set 'vm-enabled' to yes, and set the following three
 # VM parameters accordingly to your needs.
 #
 # To enable VM just set 'vm-enabled' to yes, and set the following three
 # VM parameters accordingly to your needs.

-

 vm-enabled yes
 # vm-enabled no
 
 # vm-max-memory configures the VM to use at max the specified amount of
 # RAM. Everything that deos not fit will be swapped on disk *if* possible, that
 # is, if there is still enough contiguous space in the swap file.
 vm-enabled yes
 # vm-enabled no
 
 # vm-max-memory configures the VM to use at max the specified amount of
 # RAM. Everything that deos not fit will be swapped on disk *if* possible, that
 # is, if there is still enough contiguous space in the swap file.

+#
+# With vm-max-memory 10000000 the system will swap almost everything it
+# can. Not a good default, just specify the max amount of RAM you can
+# in bytes, but it's better to leave some margin. For instance specify
+# an amount of RAM that's more or less 80% of your free RAM.

 vm-max-memory 10000000
 
 # Redis swap files is split into pages. An object can be saved using multiple
 vm-max-memory 10000000
 
 # Redis swap files is split into pages. An object can be saved using multiple


@@ -205,8 +210,10 @@ vm-page-size 256
 #
 # With the default of 256-bytes memory pages and 104857600 pages Redis will
 # use a 25 GB swap file, that will use rougly 13 MB of RAM for the page table.
 #
 # With the default of 256-bytes memory pages and 104857600 pages Redis will
 # use a 25 GB swap file, that will use rougly 13 MB of RAM for the page table.

-# vm-pages 104857600
-vm-pages 1000000
+#
+# It's better to use the smallest acceptable value for your application,
+# but the default is large in order to work in most conditions.
+vm-pages 104857600

 
 ############################### ADVANCED CONFIG ###############################
 
 
 ############################### ADVANCED CONFIG ###############################