diff options
author | antirez <antirez@gmail.com> | 2014-03-21 08:03:30 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2014-03-21 08:03:34 +0100 |
commit | 5fa3248badcd042cecc5aed29b8fb6cc59cd009a (patch) | |
tree | 3aa46dbab9a98bf4a40246a1caf03d8a931eeb7b | |
parent | a98369929e250e94240f719abcf1d6e1255202a9 (diff) | |
download | redis-5fa3248badcd042cecc5aed29b8fb6cc59cd009a.tar.gz |
The default maxmemory policy is now noeviction.
This is safer as by default maxmemory should just set a memory limit
without any key to be deleted, unless the policy is set to something
more relaxed.
-rw-r--r-- | redis.conf | 2 | ||||
-rw-r--r-- | src/redis.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/redis.conf b/redis.conf index f40d53e4d..1e53917b6 100644 --- a/redis.conf +++ b/redis.conf @@ -416,7 +416,7 @@ slave-priority 100 # # The default is: # -# maxmemory-policy volatile-lru +# maxmemory-policy noeviction # LRU and minimal TTL algorithms are not precise algorithms but approximated # algorithms (in order to save memory), so you can tune it for speed or diff --git a/src/redis.h b/src/redis.h index c14a29607..5ac794948 100644 --- a/src/redis.h +++ b/src/redis.h @@ -323,7 +323,7 @@ #define REDIS_MAXMEMORY_ALLKEYS_LRU 3 #define REDIS_MAXMEMORY_ALLKEYS_RANDOM 4 #define REDIS_MAXMEMORY_NO_EVICTION 5 -#define REDIS_DEFAULT_MAXMEMORY_POLICY REDIS_MAXMEMORY_VOLATILE_LRU +#define REDIS_DEFAULT_MAXMEMORY_POLICY REDIS_MAXMEMORY_NO_EVICTION /* Scripting */ #define REDIS_LUA_TIME_LIMIT 5000 /* milliseconds */ |