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

Fix crash when client running async keys disconnects before keys finishes

Browse Source 
Former-commit-id: dd9233c49d82c89a9d92b7251a56f91c2ee98e77
This commit is contained in:
John Sully 2019-11-21 20:40:58 -05:00
parent 5e692ff15a
commit fbc7821244
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blocked.cpp
View File

@ -111,6 +111,8 @@ void blockClient(client *c, int btype) {
serverAssert(GlobalLocksAcquired()); serverAssert(GlobalLocksAcquired());
c->flags |= CLIENT_BLOCKED; c->flags |= CLIENT_BLOCKED;
c->btype = btype; c->btype = btype;
if (btype == BLOCKED_ASYNC)
c->casyncOpsPending++;
g_pserver->blocked_clients++; g_pserver->blocked_clients++;
g_pserver->blocked_clients_by_type[btype]++; g_pserver->blocked_clients_by_type[btype]++;
} }
@ -191,7 +193,8 @@ void unblockClient(client *c) {
} else if (c->btype == BLOCKED_MODULE) { } else if (c->btype == BLOCKED_MODULE) {
unblockClientFromModule(c); unblockClientFromModule(c);
} else if (c->btype == BLOCKED_ASYNC) { } else if (c->btype == BLOCKED_ASYNC) {
serverAssert(c->casyncOpsPending > 0);
c->casyncOpsPending--;
} else { } else {
serverPanic("Unknown btype in unblockClient()."); serverPanic("Unknown btype in unblockClient().");
} }

2
src/networking.cpp
View File

@ -1624,7 +1624,7 @@ void ProcessPendingAsyncWrites()
std::atomic_thread_fence(std::memory_order_seq_cst); std::atomic_thread_fence(std::memory_order_seq_cst);
if (c->casyncOpsPending == 0) if (c->casyncOpsPending == 0 || c->btype == BLOCKED_ASYNC) // It's ok to send data if we're in a bgthread op
{ {
if (FCorrectThread(c)) if (FCorrectThread(c))
{ {