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

Merge branch 'async_commands' of https://gitlab.eqalpha.com/external-collab/keydb-pro-6 into async_commands

Browse Source 
Former-commit-id: 59423294524bb1d093a35084aa0d48989b426961
This commit is contained in:
Malavan Sotheeswaran 2021-11-30 11:48:35 -05:00
commit 90fcba1968
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster.cpp
View File

@ -5867,7 +5867,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
multiState *ms, _ms;
multiCmd mc;
int i, slot = 0, migrating_slot = 0, importing_slot = 0, missing_keys = 0;
serverAssert(GlobalLocksAcquired());
serverAssert((c->cmd->flags & CMD_ASYNC_OK) || GlobalLocksAcquired());
/* Allow any key to be set if a module disabled cluster redirections. */
if (g_pserver->cluster_module_flags & CLUSTER_MODULE_FLAG_NO_REDIRECTION)

3
src/server.cpp
View File

@ -3858,6 +3858,9 @@ void initServer(void) {
g_pserver->rgthreadvar[i].rgdbSnapshot = (const redisDbPersistentDataSnapshot**)zcalloc(sizeof(redisDbPersistentDataSnapshot*)*cserver.dbnum, MALLOC_LOCAL);
serverAssert(g_pserver->rgthreadvar[i].rgdbSnapshot != nullptr);
}
g_pserver->modulethreadvar.rgdbSnapshot = (const redisDbPersistentDataSnapshot**)zcalloc(sizeof(redisDbPersistentDataSnapshot*)*cserver.dbnum, MALLOC_LOCAL);
serverAssert(g_pserver->modulethreadvar.rgdbSnapshot != nullptr);
serverAssert(g_pserver->rgthreadvar[0].rgdbSnapshot != nullptr);
/* Fixup Master Client Database */