Commit a6a0e05a authored by zhaozhao.zz's avatar zhaozhao.zz
Browse files

Threaded IO: bugfix client kill may crash redis

parent 606a01df
...@@ -3036,16 +3036,22 @@ int handleClientsWithPendingReadsUsingThreads(void) { ...@@ -3036,16 +3036,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;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment