From 71fbeb65b62b7799b1d39c39e56af8891a19b568 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 28 May 2020 23:13:15 -0400
Subject: [PATCH] fix TLS test failure

Former-commit-id: 57ca6facc3038e005656912b6378cb7fbe04f55a
---
 src/server.cpp | 2 ++
 src/tls.cpp    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server.cpp b/src/server.cpp
index cfd739d24..4e84db6ba 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2197,7 +2197,9 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
     handleBlockedClientsTimeout();
 
     /* Handle TLS pending data. (must be done before flushAppendOnlyFile) */
+    aeReleaseLock();
     tlsProcessPendingData();
+    aeAcquireLock();
 
     /* If tls still has pending unread data don't sleep at all. */
     aeSetDontWait(eventLoop, tlsHasPendingData());
diff --git a/src/tls.cpp b/src/tls.cpp
index d297695cc..79037c71b 100644
--- a/src/tls.cpp
+++ b/src/tls.cpp
@@ -458,7 +458,6 @@ void updateSSLEvent(tls_connection *conn) {
 
 void tlsHandleEvent(tls_connection *conn, int mask) {
     int ret;
-    serverAssert(!GlobalLocksAcquired());
     serverAssert(conn->el == serverTL->el);
 
     TLSCONN_DEBUG("tlsEventHandler(): fd=%d, state=%d, mask=%d, r=%d, w=%d, flags=%d",
@@ -910,6 +909,7 @@ int tlsHasPendingData() {
 int tlsProcessPendingData() {
     listIter li;
     listNode *ln;
+    serverAssert(!GlobalLocksAcquired());
 
     int processed = listLength(pending_list);
     listRewind(pending_list,&li);