Permalink
Browse files

a new default redis.conf

  • Loading branch information...
1 parent 7d98e08 commit 38aba9a12124bc57567a452b1a371bf0bedd5b6e @antirez committed Jan 7, 2010
Showing with 17 additions and 7 deletions.
  1. +3 −0 redis.c
  2. +14 −7 redis.conf
View
@@ -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--;
+ } else {
+ redisLog(REDIS_DEBUG, "VM: object %s previewed from disk",
+ (unsigned char*) key->ptr);
}
server.vm_stats_swapins++;
return val;
View
@@ -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)
+# 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)
-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
@@ -52,9 +53,9 @@ databases 16
#
# 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.
@@ -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.
-
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
@@ -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.
-# 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 ###############################

0 comments on commit 38aba9a

Please sign in to comment.