Unverified Commit 6a9851c7 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #6554 from soloestoy/unblock-as-call

expires & blocking: handle ready keys as call()
parents 77ad9aaa 7059ecee
...@@ -514,6 +514,9 @@ void handleClientsBlockedOnKeys(void) { ...@@ -514,6 +514,9 @@ void handleClientsBlockedOnKeys(void) {
* we can safely call signalKeyAsReady() against this key. */ * we can safely call signalKeyAsReady() against this key. */
dictDelete(rl->db->ready_keys,rl->key); dictDelete(rl->db->ready_keys,rl->key);
server.call_depth++;
updateCachedTime(0);
/* Serve clients blocked on list key. */ /* Serve clients blocked on list key. */
robj *o = lookupKeyWrite(rl->db,rl->key); robj *o = lookupKeyWrite(rl->db,rl->key);
...@@ -530,6 +533,8 @@ void handleClientsBlockedOnKeys(void) { ...@@ -530,6 +533,8 @@ void handleClientsBlockedOnKeys(void) {
serveClientsBlockedOnKeyByModule(rl); serveClientsBlockedOnKeyByModule(rl);
} }
server.call_depth++;
/* Free this item. */ /* Free this item. */
decrRefCount(rl->key); decrRefCount(rl->key);
zfree(rl); zfree(rl);
......
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