gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: The dabase count configuration is not respected

Browse Source 
Former-commit-id: 149c3cf3dd75e8058c7c560d6a7ffbbb95da3898
This commit is contained in:
John Sully 2019-07-12 02:13:37 -04:00
parent 9dbcfc9d24
commit 42143ac654
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/server.cpp
View File

@ -2495,20 +2495,6 @@ void initServerConfig(void) {
/* Multithreading */ /* Multithreading */
cserver.cthreads = CONFIG_DEFAULT_THREADS; cserver.cthreads = CONFIG_DEFAULT_THREADS;
cserver.fThreadAffinity = CONFIG_DEFAULT_THREAD_AFFINITY; cserver.fThreadAffinity = CONFIG_DEFAULT_THREAD_AFFINITY;
g_pserver->db = (redisDb*)zmalloc(sizeof(redisDb)*cserver.dbnum, MALLOC_LOCAL);
/* Create the Redis databases, and initialize other internal state. */
for (int j = 0; j < cserver.dbnum; j++) {
g_pserver->db[j].pdict = dictCreate(&dbDictType,NULL);
g_pserver->db[j].expires = dictCreate(&keyptrDictType,NULL);
g_pserver->db[j].blocking_keys = dictCreate(&keylistDictType,NULL);
g_pserver->db[j].ready_keys = dictCreate(&objectKeyPointerValueDictType,NULL);
g_pserver->db[j].watched_keys = dictCreate(&keylistDictType,NULL);
g_pserver->db[j].id = j;
g_pserver->db[j].avg_ttl = 0;
g_pserver->db[j].defrag_later = listCreate();
}
} }
extern char **environ; extern char **environ;
@ -2914,6 +2900,20 @@ void initServer(void) {
fastlock_init(&g_pserver->flock); fastlock_init(&g_pserver->flock);
g_pserver->db = (redisDb*)zmalloc(sizeof(redisDb)*cserver.dbnum, MALLOC_LOCAL);
/* Create the Redis databases, and initialize other internal state. */
for (int j = 0; j < cserver.dbnum; j++) {
g_pserver->db[j].pdict = dictCreate(&dbDictType,NULL);
g_pserver->db[j].expires = dictCreate(&keyptrDictType,NULL);
g_pserver->db[j].blocking_keys = dictCreate(&keylistDictType,NULL);
g_pserver->db[j].ready_keys = dictCreate(&objectKeyPointerValueDictType,NULL);
g_pserver->db[j].watched_keys = dictCreate(&keylistDictType,NULL);
g_pserver->db[j].id = j;
g_pserver->db[j].avg_ttl = 0;
g_pserver->db[j].defrag_later = listCreate();
}
if (g_pserver->syslog_enabled) { if (g_pserver->syslog_enabled) {
openlog(g_pserver->syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT, openlog(g_pserver->syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT,
g_pserver->syslog_facility); g_pserver->syslog_facility);

7
tests/unit/other.tcl
View File

@ -1,3 +1,10 @@
start_server {tags {"other"} overrides {databases 64}} {
test {CONF-DATABASES - ensure the databases config option is respected} {
r select 63
r set testkey {foo}
} {OK}
}
start_server {tags {"other"}} { start_server {tags {"other"}} {
if {$::force_failure} { if {$::force_failure} {
# This is used just for test suite development purposes. # This is used just for test suite development purposes.