fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-22 05:21:33 +00:00
Code Issues Projects Releases Wiki Activity

vm_blocked_clients count fixed in INFO, thanks to Pietern Noordhuis

Browse Source
This commit is contained in:
antirez
2010-07-21 13:15:03 +02:00
parent 243b914bd6
commit b25b61eb97
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
redis.c
View File

@ -2026,18 +2026,25 @@ static void freeClient(redisClient *c) {
ln = listSearchKey(server.clients,c); ln = listSearchKey(server.clients,c);
redisAssert(ln != NULL); redisAssert(ln != NULL);
listDelNode(server.clients,ln); listDelNode(server.clients,ln);
/* Remove from the list of clients waiting for swapped keys */ /* Remove from the list of clients waiting for swapped keys, or ready
if (c->flags & REDIS_IO_WAIT && listLength(c->io_keys) == 0) { * to be restarted, but not yet woken up again. */
if (c->flags & REDIS_IO_WAIT) {
redisAssert(server.vm_enabled);
if (listLength(c->io_keys) == 0) {
ln = listSearchKey(server.io_ready_clients,c); ln = listSearchKey(server.io_ready_clients,c);
if (ln) {
/* When this client is waiting to be woken up (REDIS_IO_WAIT),
* it should be present in the list io_ready_clients */
redisAssert(ln != NULL);
listDelNode(server.io_ready_clients,ln); listDelNode(server.io_ready_clients,ln);
server.vm_blocked_clients--; } else {
} while (listLength(c->io_keys)) {
}
while (server.vm_enabled && listLength(c->io_keys)) {
ln = listFirst(c->io_keys); ln = listFirst(c->io_keys);
dontWaitForSwappedKey(c,ln->value); dontWaitForSwappedKey(c,ln->value);
} }
}
server.vm_blocked_clients--;
}
listRelease(c->io_keys); listRelease(c->io_keys);
/* Master/slave cleanup */ /* Master/slave cleanup */
if (c->flags & REDIS_SLAVE) { if (c->flags & REDIS_SLAVE) {