mirror of
https://github.com/Snapchat/KeyDB.git
synced 2026-11-13 20:32:09 -05:00
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 32f34f63fd
This commit is contained in:
commit
8d720e220d
3 files changed
+41
-49
No files matched your search
@@ -3193,6 +3193,7 @@ int processEventsWhileBlocked(int iel) {
|
||||
serverAssert(c->flags & CLIENT_PROTECTED);
|
||||
c->lock.unlock();
|
||||
}
|
||||
|
||||
aeReleaseLock();
|
||||
serverAssertDebug(!GlobalLocksAcquired());
|
||||
try
|
||||
@@ -3215,6 +3216,7 @@ int processEventsWhileBlocked(int iel) {
|
||||
locker.release();
|
||||
throw;
|
||||
}
|
||||
|
||||
AeLocker locker;
|
||||
if (c != nullptr)
|
||||
c->lock.lock();
|
||||
|
||||
Reference in new issue
Block a user