Commit 91b49667 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #3188 from therealbill/unstable

maxmemory_policy fix for #3187
parents de3a6736 14086a46
...@@ -126,8 +126,8 @@ const char *configEnumGetNameOrUnknown(configEnum *ce, int val) { ...@@ -126,8 +126,8 @@ const char *configEnumGetNameOrUnknown(configEnum *ce, int val) {
} }
/* Used for INFO generation. */ /* Used for INFO generation. */
const char *maxmemoryToString(void) { const char *evictPolicyToString(void) {
return configEnumGetNameOrUnknown(maxmemory_policy_enum,server.maxmemory); return configEnumGetNameOrUnknown(maxmemory_policy_enum,server.maxmemory_policy);
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
......
...@@ -2937,7 +2937,7 @@ sds genRedisInfoString(char *section) { ...@@ -2937,7 +2937,7 @@ sds genRedisInfoString(char *section) {
char maxmemory_hmem[64]; char maxmemory_hmem[64];
size_t zmalloc_used = zmalloc_used_memory(); size_t zmalloc_used = zmalloc_used_memory();
size_t total_system_mem = server.system_memory_size; size_t total_system_mem = server.system_memory_size;
const char *evict_policy = maxmemoryToString(); const char *evict_policy = evictPolicyToString();
long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024; long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024;
/* Peak memory is updated from time to time by serverCron() so it /* Peak memory is updated from time to time by serverCron() so it
......
...@@ -1367,7 +1367,7 @@ void closeListeningSockets(int unlink_unix_socket); ...@@ -1367,7 +1367,7 @@ void closeListeningSockets(int unlink_unix_socket);
void updateCachedTime(void); void updateCachedTime(void);
void resetServerStats(void); void resetServerStats(void);
unsigned int getLRUClock(void); unsigned int getLRUClock(void);
const char *maxmemoryToString(void); const char *evictPolicyToString(void);
#define RESTART_SERVER_NONE 0 #define RESTART_SERVER_NONE 0
#define RESTART_SERVER_GRACEFULLY (1<<0) /* Do proper shutdown. */ #define RESTART_SERVER_GRACEFULLY (1<<0) /* Do proper shutdown. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment