From 368ee792107961c6ad7c140864af276955f5dc58 Mon Sep 17 00:00:00 2001
From: WenTao Ou <admin@owent.net>
Date: Thu, 28 Sep 2023 15:02:55 +0800
Subject: [PATCH] Fix deadlock when shuting down http client. (#2337)

---
 ext/src/http/client/curl/http_client_curl.cc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc
index 94bbf9fa7b..287059a1c6 100644
--- a/ext/src/http/client/curl/http_client_curl.cc
+++ b/ext/src/http/client/curl/http_client_curl.cc
@@ -244,6 +244,7 @@ void HttpClient::CleanupSession(uint64_t session_id)
     }
   }
 
+  bool need_wakeup_background_thread = false;
   {
     std::lock_guard<std::recursive_mutex> lock_guard{session_ids_m_};
     pending_to_add_session_ids_.erase(session_id);
@@ -259,10 +260,15 @@ void HttpClient::CleanupSession(uint64_t session_id)
       {
         // If this session is already running, give it to the background thread for cleanup.
         pending_to_abort_sessions_[session_id] = std::move(session);
-        wakeupBackgroundThread();
+        need_wakeup_background_thread          = true;
       }
     }
   }
+
+  if (need_wakeup_background_thread)
+  {
+    wakeupBackgroundThread();
+  }
 }
 
 void HttpClient::MaybeSpawnBackgroundThread()
@@ -519,7 +525,8 @@ bool HttpClient::doRemoveSessions()
       std::lock_guard<std::recursive_mutex> session_id_lock_guard{session_ids_m_};
       pending_to_remove_session_handles_.swap(pending_to_remove_session_handles);
       pending_to_remove_sessions_.swap(pending_to_remove_sessions);
-
+    }
+    {
       // If user callback do not call CancelSession or FinishSession, We still need to remove it
       // from sessions_
       std::lock_guard<std::mutex> session_lock_guard{sessions_m_};