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

Fix coredump after Client Unpause command when threaded I/O is enabled (#9041)

Browse Source 
Fix crash when using io-threads-do-reads and issuing CLIENT PAUSE and
CLIENT UNPAUSE.
This issue was introduced in redis 6.2 together with the FAILOVER command.

(cherry picked from commit 096c5fd5d22caa2c21a4863cbaaf64fd8e7107d2)
This commit is contained in:
yvette903 2021-06-15 14:21:52 +08:00 committed by Oran Agra
parent c547dff650
commit 8bd5e39102
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/networking.c
View File

@ -3654,7 +3654,7 @@ int postponeClientRead(client *c) {
if (server.io_threads_active && if (server.io_threads_active &&
server.io_threads_do_reads && server.io_threads_do_reads &&
!ProcessingEventsWhileBlocked && !ProcessingEventsWhileBlocked &&
!(c->flags & (CLIENT_MASTER|CLIENT_SLAVE|CLIENT_PENDING_READ))) !(c->flags & (CLIENT_MASTER|CLIENT_SLAVE|CLIENT_PENDING_READ|CLIENT_BLOCKED)))
{ {
c->flags |= CLIENT_PENDING_READ; c->flags |= CLIENT_PENDING_READ;
listAddNodeHead(server.clients_pending_read,c); listAddNodeHead(server.clients_pending_read,c);
@ -3718,6 +3718,7 @@ int handleClientsWithPendingReadsUsingThreads(void) {
c->flags &= ~CLIENT_PENDING_READ; c->flags &= ~CLIENT_PENDING_READ;
listDelNode(server.clients_pending_read,ln); listDelNode(server.clients_pending_read,ln);
serverAssert(!(c->flags & CLIENT_BLOCKED));
if (processPendingCommandsAndResetClient(c) == C_ERR) { if (processPendingCommandsAndResetClient(c) == C_ERR) {
/* If the client is no longer valid, we avoid /* If the client is no longer valid, we avoid
* processing the client later. So we just go * processing the client later. So we just go