From c1893c0e512af95e337bf8e8b44e17831ca3218d Mon Sep 17 00:00:00 2001
From: Keleborn <22352763+Celandriel@users.noreply.github.com>
Date: Fri, 11 Sep 2026 04:08:27 -0700
Subject: [PATCH] fix(Core/Database): allow reopening a DatabaseWorkerPool
 after a failed Open() (#27585)

---
 src/common/Threading/PCQueue.h                      | 9 +++++++++
 src/server/database/Database/DatabaseWorkerPool.cpp | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/src/common/Threading/PCQueue.h b/src/common/Threading/PCQueue.h
index f66adb235e..e65a1d78fc 100644
--- a/src/common/Threading/PCQueue.h
+++ b/src/common/Threading/PCQueue.h
@@ -102,6 +102,15 @@ public:
         _condition.notify_all();
     }
 
+    // Reopens the queue after Cancel()/Shutdown() so new consumers can be attached.
+    // Callers must make sure the previous consumers have already stopped.
+    void Reset()
+    {
+        std::lock_guard<std::mutex> lock(_queueLock);
+        _cancel = false;
+        _shutdown = false;
+    }
+
 private:
     template<typename E = T>
     typename std::enable_if<std::is_pointer<E>::value>::type DeleteQueuedObject(E& obj)
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
index ee19a5a48c..c57a65b97e 100644
--- a/src/server/database/Database/DatabaseWorkerPool.cpp
+++ b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -91,6 +91,11 @@ uint32 DatabaseWorkerPool<T>::Open()
     LOG_INFO("sql.driver", "Opening DatabasePool '{}'. Asynchronous connections: {}, synchronous connections: {}.",
         GetDatabaseName(), _async_threads, _synch_threads);
 
+    _queue->Cancel();
+    _connections[IDX_ASYNC].clear();
+    _connections[IDX_SYNCH].clear();
+    _queue->Reset();
+
     uint32 error = OpenConnections(IDX_ASYNC, _async_threads);
 
     if (error)