From 11a832fa8ba2362a0efcde601e7225582326e0da Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Sep 2024 13:38:49 +0200 Subject: Core/Database: Change database async thread shutdown to fix some corner cases leading to servers being stuck on shutdown (for example with exit() call) --- src/server/database/Database/MySQLConnection.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/server/database/Database/MySQLConnection.cpp') diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index 7efe93c34f7..3437fc55b1d 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -47,6 +47,12 @@ MySQLConnectionInfo::MySQLConnectionInfo(std::string const& infoString) ssl.assign(tokens[5]); } +struct MySQLConnection::WorkerThread +{ + std::thread ThreadHandle; + boost::asio::executor_work_guard WorkGuard; +}; + MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo, ConnectionFlags connectionFlags) : m_reconnecting(false), m_prepareError(false), @@ -66,7 +72,8 @@ void MySQLConnection::Close() // Stop the worker thread before the statements are cleared if (m_workerThread) { - m_workerThread->join(); + m_workerThread->WorkGuard.reset(); + m_workerThread->ThreadHandle.join(); m_workerThread.reset(); } @@ -444,18 +451,18 @@ uint32 MySQLConnection::GetLastError() void MySQLConnection::StartWorkerThread(Trinity::Asio::IoContext* context) { - m_workerThread = std::make_unique([context] - { - boost::asio::executor_work_guard executorWorkGuard = boost::asio::make_work_guard(context->get_executor()); + boost::asio::executor_work_guard executorWorkGuard = boost::asio::make_work_guard(context->get_executor()); // construct guard before thread starts running - context->run(); + m_workerThread = std::make_unique(WorkerThread{ + .ThreadHandle = std::thread([context] { context->run(); }), + .WorkGuard = std::move(executorWorkGuard) }); } std::thread::id MySQLConnection::GetWorkerThreadId() const { if (m_workerThread) - return m_workerThread->get_id(); + return m_workerThread->ThreadHandle.get_id(); return {}; } -- cgit v1.2.3