Commit 2d7d75ad authored by antirez's avatar antirez
Browse files

Net: clientsArePaused() should not touch blocked clients.

When the list of unblocked clients were processed, btype was set to
blocking type none, but the client remained flagged with REDIS_BLOCKED.
When timeout is reached (or when the client disconnects), unblocking it
will trigger an assertion.

There is no need to process pending requests from blocked clients, so
now clientsArePaused() just avoid touching blocked clients.

Close #2467.
parent 8dac5c8b
......@@ -1702,7 +1702,7 @@ int clientsArePaused(void) {
while ((ln = listNext(&li)) != NULL) {
c = listNodeValue(ln);
if (c->flags & REDIS_SLAVE) continue;
if (c->flags & (REDIS_SLAVE|REDIS_BLOCKED)) continue;
listAddNodeTail(server.unblocked_clients,c);
}
}
......
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