Merge branch 'unstable' into redis_6_merge

Former-commit-id: 32f34f63fd
This commit is contained in:
John Sully committed 2020-02-17 19:55:29 -05:00
commit 8d720e220d
3 files changed
+41 -49

No files matched your search

+2
View File
@@ -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();