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

Merge pull request #6991 from soloestoy/io-threads-bugfix

Browse Source 
Threaded IO: bugfix client kill may crash redis
This commit is contained in:
Salvatore Sanfilippo 2020-03-16 10:53:54 +01:00 committed by GitHub
commit 15338ab694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/networking.c
View File

@ -3040,16 +3040,22 @@ int handleClientsWithPendingReadsUsingThreads(void) {
if (tio_debug) printf("I/O READ All threads finshed\n"); if (tio_debug) printf("I/O READ All threads finshed\n");
/* Run the list of clients again to process the new buffers. */ /* Run the list of clients again to process the new buffers. */
listRewind(server.clients_pending_read,&li); while(listLength(server.clients_pending_read)) {
while((ln = listNext(&li))) { ln = listFirst(server.clients_pending_read);
client *c = listNodeValue(ln); client *c = listNodeValue(ln);
c->flags &= ~CLIENT_PENDING_READ; c->flags &= ~CLIENT_PENDING_READ;
listDelNode(server.clients_pending_read,ln);
if (c->flags & CLIENT_PENDING_COMMAND) { if (c->flags & CLIENT_PENDING_COMMAND) {
c->flags &= ~ CLIENT_PENDING_COMMAND; c->flags &= ~CLIENT_PENDING_COMMAND;
processCommandAndResetClient(c); if (processCommandAndResetClient(c) == C_ERR) {
/* If the client is no longer valid, we avoid
* processing the client later. So we just go
* to the next. */
continue;
}
} }
processInputBufferAndReplicate(c); processInputBufferAndReplicate(c);
} }
listEmpty(server.clients_pending_read);
return processed; return processed;
} }