From: antirez <antirez@gmail.com>
Date: Wed, 8 Sep 2010 11:26:16 +0000 (+0200)
Subject: Fixed a race condition in VM happening when a key was deleted while there was a clien... 
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/7f00cd226438d3cd91238974346cee624d8920e1

Fixed a race condition in VM happening when a key was deleted while there was a client waiting for this key to be resumed from swap to memory. The client would hang forever.
---

diff --git a/src/db.c b/src/db.c
index f380bf6e..ca520c82 100644
--- a/src/db.c
+++ b/src/db.c
@@ -123,6 +123,11 @@ robj *dbRandomKey(redisDb *db) {
 
 /* Delete a key, value, and associated expiration entry if any, from the DB */
 int dbDelete(redisDb *db, robj *key) {
+    /* If VM is enabled make sure to awake waiting clients for this key:
+     * deleting the key will kill the I/O thread bringing the key from swap
+     * to memory, so the client will never be notified and unblocked if we
+     * don't do it now. */
+    handleClientsBlockedOnSwappedKey(db,key);
     /* Deleting an entry from the expires dict will not free the sds of
      * the key, because it is shared with the main dictionary. */
     if (dictSize(db->expires) > 0) dictDelete(db->expires,key->ptr);