Merge remote branch 'pietern/networking-perf'

[redis.git] / src / db.c

diff --git a/src/db.c b/src/db.c
index fc0595100ecb7f7637d9b091bea644500e1be0b5..470310a304c279536efbf6ddc313a9a3eea05714 100644 (file)
--- 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. */
+    if (server.vm_enabled) 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);