From f2e00755e39b0e96047a3247db8ee0d3d6f4ee16 Mon Sep 17 00:00:00 2001 From: VivekSainiEQ Date: Mon, 22 Nov 2021 22:21:57 +0000 Subject: [PATCH 1/2] Fix failing cluster test Former-commit-id: 960503a4710d4379d5ebbb67d7ac82705f312913 --- src/cluster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cluster.cpp b/src/cluster.cpp index b86ad81d3..10f50f62f 100644 --- a/src/cluster.cpp +++ b/src/cluster.cpp @@ -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) From 91c758f153a3bbe43f8f91e2799664990d86d944 Mon Sep 17 00:00:00 2001 From: VivekSainiEQ Date: Wed, 24 Nov 2021 01:42:01 +0000 Subject: [PATCH 2/2] Initialize snapshots for module thread var Former-commit-id: c263e0df22bab35d8417eb396d250e00e8853ab3 --- src/server.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server.cpp b/src/server.cpp index 10fae5779..e5b6a9482 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3846,6 +3846,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 */